diff options
| author | Paweł Bylica <chfast@gmail.com> | 2017-08-24 04:09:07 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-24 04:09:07 +0800 |
| commit | b0c78eaee8dab6f3013e69279fde909a06aba817 (patch) | |
| tree | 2e9c9ae948872c7828bfa91b47cf2c8913aba686 | |
| parent | 3b07c4d38e40c52ee8a4d16e56e2afa1a0f27905 (diff) | |
| parent | d57e3d7f72708bdb75d861bb8d6cc7bbe7db7263 (diff) | |
| download | dexon-solidity-b0c78eaee8dab6f3013e69279fde909a06aba817.tar.gz dexon-solidity-b0c78eaee8dab6f3013e69279fde909a06aba817.tar.zst dexon-solidity-b0c78eaee8dab6f3013e69279fde909a06aba817.zip | |
Merge pull request #2784 from ethereum/cmake-3.0
Fix CMake 3.0 compatibility
| -rw-r--r-- | cmake/EthDependencies.cmake | 2 | ||||
| -rw-r--r-- | libdevcore/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cmake/EthDependencies.cmake b/cmake/EthDependencies.cmake index 39ce060e..3d05d44b 100644 --- a/cmake/EthDependencies.cmake +++ b/cmake/EthDependencies.cmake @@ -45,7 +45,7 @@ find_program(CTEST_COMMAND ctest) set(Boost_USE_MULTITHREADED ON) option(Boost_USE_STATIC_LIBS "Link Boost statically" ON) -find_package(Boost 1.54.0 QUIET REQUIRED COMPONENTS regex filesystem unit_test_framework program_options) +find_package(Boost 1.54.0 QUIET REQUIRED COMPONENTS regex filesystem unit_test_framework program_options system) eth_show_dependency(Boost boost) diff --git a/libdevcore/CMakeLists.txt b/libdevcore/CMakeLists.txt index b97866f4..a1c4c2d3 100644 --- a/libdevcore/CMakeLists.txt +++ b/libdevcore/CMakeLists.txt @@ -2,7 +2,7 @@ file(GLOB sources "*.cpp") file(GLOB headers "*.h") add_library(devcore ${sources} ${headers}) -target_link_libraries(devcore PRIVATE ${Boost_FILESYSTEM_LIBRARIES} ${Boost_REGEX_LIBRARIES} ${Boost_SYSTEM_LIBRARIES} Threads::Threads) +target_link_libraries(devcore PRIVATE ${Boost_FILESYSTEM_LIBRARIES} ${Boost_REGEX_LIBRARIES} ${Boost_SYSTEM_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) target_include_directories(devcore SYSTEM PUBLIC ${Boost_INCLUDE_DIRS}) target_include_directories(devcore PUBLIC "${CMAKE_SOURCE_DIR}") add_dependencies(devcore solidity_BuildInfo.h) |