diff options
| -rw-r--r-- | cmake/EthDependencies.cmake | 7 | ||||
| -rw-r--r-- | libdevcore/CMakeLists.txt | 6 |
2 files changed, 2 insertions, 11 deletions
diff --git a/cmake/EthDependencies.cmake b/cmake/EthDependencies.cmake index 233ac22a..cc2f8711 100644 --- a/cmake/EthDependencies.cmake +++ b/cmake/EthDependencies.cmake @@ -34,13 +34,6 @@ endif() set(ETH_CMAKE_DIR ${CMAKE_CURRENT_LIST_DIR}) set(ETH_SCRIPTS_DIR ${ETH_CMAKE_DIR}/scripts) -find_program(CTEST_COMMAND ctest) - -#message(STATUS "CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH}") -#message(STATUS "CMake Helper Path: ${ETH_CMAKE_DIR}") -#message(STATUS "CMake Script Path: ${ETH_SCRIPTS_DIR}") -#message(STATUS "ctest path: ${CTEST_COMMAND}") - ## use multithreaded boost libraries, with -mt suffix set(Boost_USE_MULTITHREADED ON) option(Boost_USE_STATIC_LIBS "Link Boost statically" ON) diff --git a/libdevcore/CMakeLists.txt b/libdevcore/CMakeLists.txt index d107f701..fa7e3f48 100644 --- a/libdevcore/CMakeLists.txt +++ b/libdevcore/CMakeLists.txt @@ -2,9 +2,7 @@ file(GLOB sources "*.cpp") file(GLOB headers "*.h") add_library(devcore ${sources} ${headers}) -target_link_libraries(devcore PRIVATE ${JSONCPP_LIBRARY} ${Boost_FILESYSTEM_LIBRARIES} ${Boost_REGEX_LIBRARIES} ${Boost_SYSTEM_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) -target_include_directories(devcore SYSTEM PUBLIC ${Boost_INCLUDE_DIRS}) +target_link_libraries(devcore PRIVATE jsoncpp ${Boost_FILESYSTEM_LIBRARIES} ${Boost_REGEX_LIBRARIES} ${Boost_SYSTEM_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) target_include_directories(devcore PUBLIC "${CMAKE_SOURCE_DIR}") -target_include_directories(devcore PUBLIC "${JSONCPP_INCLUDE_DIR}") -add_dependencies(devcore jsoncpp) +target_include_directories(devcore SYSTEM PUBLIC ${Boost_INCLUDE_DIRS}) add_dependencies(devcore solidity_BuildInfo.h) |