Skip to content
This repository has been archived by the owner on Aug 2, 2022. It is now read-only.

[XC 10.2] Remove final boost thread references in cmake & change macos boost build #7036

Merged
merged 2 commits into from
Apr 1, 2019
Merged

[XC 10.2] Remove final boost thread references in cmake & change macos boost build #7036

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a560fd3
Remove final remnants of boost thread usage from cmake
spoonincode Mar 31, 2019
8ea813a
When building boost on macos, only build the libraries needed by eosio
spoonincode Mar 31, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,23 +104,23 @@ IF( WIN32 )
set(BOOST_ALL_DYN_LINK OFF) # force dynamic linking for all libraries
ENDIF(WIN32)
FIND_PACKAGE(Boost 1.67 REQUIRED COMPONENTS
thread
date_time
filesystem
system
program_options
serialization
chrono
unit_test_framework
context
locale
iostreams)

# Some new stdlibc++s will #error on <experimental/string_view>; a problem for boost pre-1.69
if( APPLE AND UNIX )
add_definitions(-DBOOST_ASIO_DISABLE_STD_EXPERIMENTAL_STRING_VIEW)
endif()

set(THREADS_PREFER_PTHREAD_FLAG 1)
find_package(Threads)
link_libraries(Threads::Threads)

if( WIN32 )

message( STATUS "Configuring EOSIO on WIN32")
Expand Down
2 changes: 1 addition & 1 deletion libraries/appbase
Open in desktop
Submodule appbase updated 2 files
+2 −4 CMakeLists.txt
+6 −1 application.cpp
3 changes: 2 additions & 1 deletion scripts/eosio_build_darwin.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,8 @@ if [ "${BOOSTVERSION}" != "${BOOST_VERSION_MAJOR}0${BOOST_VERSION_MINOR}0${BOOST
&& tar -xjf boost_$BOOST_VERSION.tar.bz2 \
&& cd $BOOST_ROOT \
&& ./bootstrap.sh --prefix=$BOOST_ROOT \
&& ./b2 -q -j$(sysctl -in machdep.cpu.core_count) install \
&& ./b2 -q -j$(sysctl -in machdep.cpu.core_count) --with-iostreams --with-date_time --with-filesystem \
--with-system --with-program_options --with-chrono --with-test install \
&& cd .. \
&& rm -f boost_$BOOST_VERSION.tar.bz2 \
&& rm -rf $BOOST_LINK_LOCATION \
Expand Down