diff options
| author | Conlain Kelly <conlain.k@gmail.com> | 2018-06-18 09:44:18 -0400 |
|---|---|---|
| committer | Conlain Kelly <conlain.k@gmail.com> | 2018-06-18 09:44:18 -0400 |
| commit | c78c470b991a38037a4ada48b13cba9b3daf1c44 (patch) | |
| tree | 89700c68b02b1d5b5de2fd47585c666cc0ddd648 | |
| parent | a115369e1188516731f95dcdedd570788db540f3 (diff) | |
| download | sdl_core-c78c470b991a38037a4ada48b13cba9b3daf1c44.tar.gz | |
Add CMake support for building needed boost libraries on clean system
| -rw-r--r-- | src/3rd_party/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | src/components/utils/CMakeLists.txt | 2 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/3rd_party/CMakeLists.txt b/src/3rd_party/CMakeLists.txt index b97c05f7f9..63148eff2b 100644 --- a/src/3rd_party/CMakeLists.txt +++ b/src/3rd_party/CMakeLists.txt @@ -30,8 +30,8 @@ include("./set_3rd_party_paths.cmake") -set(3RD_PARTY_SOURCE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) -set(3RD_PARTY_BINARY_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) +set(3RD_PARTY_SOURCE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) +set(3RD_PARTY_BINARY_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) set (install-3rd_party_logger_var "") @@ -208,7 +208,7 @@ else() endif() if (HMIADAPTER STREQUAL "messagebroker") - find_package(Boost 1.66.0 COMPONENTS system) + find_package(Boost 1.66.0 COMPONENTS system) set(BOOST_LIB_SOURCE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/boost_src) set(BOOST_LIBS_DIRECTORY ${3RD_PARTY_INSTALL_PREFIX}/lib) SET_PROPERTY(GLOBAL PROPERTY GLOBAL_BOOST_LIBS ${BOOST_LIBS_DIRECTORY}) @@ -225,9 +225,9 @@ if (HMIADAPTER STREQUAL "messagebroker") URL https://dl.bintray.com/boostorg/release/1.66.0/source/boost_1_66_0.tar.gz DOWNLOAD_DIR ${BOOST_LIB_SOURCE_DIRECTORY} SOURCE_DIR ${BOOST_LIB_SOURCE_DIRECTORY} - CONFIGURE_COMMAND ./bootstrap.sh --with-libraries=system --prefix=${3RD_PARTY_INSTALL_PREFIX} + CONFIGURE_COMMAND ./bootstrap.sh --with-libraries=system,filesystem --prefix=${3RD_PARTY_INSTALL_PREFIX} BUILD_COMMAND ./b2 - INSTALL_COMMAND ${BOOST_INSTALL_COMMAND} --with-system --prefix=${3RD_PARTY_INSTALL_PREFIX} + INSTALL_COMMAND ${BOOST_INSTALL_COMMAND} --with-system --with-filesystem --prefix=${3RD_PARTY_INSTALL_PREFIX} INSTALL_DIR ${3RD_PARTY_INSTALL_PREFIX} BUILD_IN_SOURCE true ) @@ -243,4 +243,3 @@ add_custom_target(install-3rd_party DEPENDS Boost WORKING_DIRECTORY ${3RD_PARTY_BINARY_DIRECTORY} ) - diff --git a/src/components/utils/CMakeLists.txt b/src/components/utils/CMakeLists.txt index 837a237c6c..32e2cbdfe7 100644 --- a/src/components/utils/CMakeLists.txt +++ b/src/components/utils/CMakeLists.txt @@ -118,7 +118,7 @@ list(APPEND LIBRARIES -lboost_system -lboost_filesystem) target_link_libraries("Utils" ${LIBRARIES}) if(ENABLE_LOG) - add_dependencies("Utils" install-3rd_party_logger) + add_dependencies("Utils" install-3rd_party_logger Boost) endif() if(BUILD_TESTS) |