diff options
-rw-r--r-- | src/3rd_party/CMakeLists.txt | 6 | ||||
-rw-r--r-- | src/components/application_manager/CMakeLists.txt | 1 | ||||
-rw-r--r-- | src/components/application_manager/test/application_manager_impl_test.cc | 2 | ||||
-rw-r--r-- | src/components/config_profile/CMakeLists.txt | 1 | ||||
-rw-r--r-- | src/components/connection_handler/CMakeLists.txt | 1 | ||||
-rw-r--r-- | src/components/formatters/CMakeLists.txt | 1 | ||||
-rw-r--r-- | src/components/interfaces/CMakeLists.txt | 1 | ||||
-rw-r--r-- | src/components/media_manager/CMakeLists.txt | 1 | ||||
-rw-r--r-- | src/components/policy/policy_external/CMakeLists.txt | 1 | ||||
-rw-r--r-- | src/components/policy/policy_regular/CMakeLists.txt | 1 | ||||
-rw-r--r-- | src/components/security_manager/CMakeLists.txt | 1 | ||||
-rw-r--r-- | src/components/smart_objects/CMakeLists.txt | 1 | ||||
-rw-r--r-- | src/components/telemetry_monitor/CMakeLists.txt | 1 | ||||
-rw-r--r-- | src/components/transport_manager/CMakeLists.txt | 1 | ||||
-rw-r--r-- | src/components/utils/CMakeLists.txt | 1 |
15 files changed, 17 insertions, 4 deletions
diff --git a/src/3rd_party/CMakeLists.txt b/src/3rd_party/CMakeLists.txt index 60d68e9d60..c0c6bbfa67 100644 --- a/src/3rd_party/CMakeLists.txt +++ b/src/3rd_party/CMakeLists.txt @@ -209,11 +209,12 @@ else() ) endif() +set(BOOST_ROOT ${3RD_PARTY_INSTALL_PREFIX}) find_package(Boost 1.66.0 COMPONENTS system thread date_time filesystem regex) set(BOOST_LIB_SOURCE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/boost_src) set(BOOST_LIBS_DIRECTORY ${3RD_PARTY_INSTALL_PREFIX}/lib) +set(BOOST_INCLUDE_DIR ${3RD_PARTY_INSTALL_PREFIX}/include PARENT_SCOPE) SET_PROPERTY(GLOBAL PROPERTY GLOBAL_BOOST_LIBS ${BOOST_LIBS_DIRECTORY}) -set(BOOST_INCLUDE_DIRECTORY ${3RD_PARTY_INSTALL_PREFIX}/include ) if (NOT ${Boost_FOUND}) message(STATUS "Did not find boost. Downloading and installing boost 1.66") set(BOOST_INSTALL_COMMAND ./b2 install) @@ -232,9 +233,6 @@ if (NOT ${Boost_FOUND}) INSTALL_DIR ${3RD_PARTY_INSTALL_PREFIX} BUILD_IN_SOURCE true ) - - set(BOOST_INCLUDE_DIR ${BOOST_ROOT_DIR}/Boost-prefix/src/Boost) - set(BOOST_LIB_DIR ${BOOST_ROOT_DIR}/Boost-prefix/src/Boost/stage/lib/) else() add_custom_target(Boost) # empty target, Boost is already installed endif() diff --git a/src/components/application_manager/CMakeLists.txt b/src/components/application_manager/CMakeLists.txt index 67a7136a62..625e119270 100644 --- a/src/components/application_manager/CMakeLists.txt +++ b/src/components/application_manager/CMakeLists.txt @@ -61,6 +61,7 @@ include_directories ( ${ENCRYPTION_INCLUDE_DIRECTORY} ${MESSAGE_BROKER_INCLUDE_DIRECTORY} ${LOG4CXX_INCLUDE_DIRECTORY} + ${BOOST_INCLUDE_DIR} ${BSON_INCLUDE_DIRECTORY} ) diff --git a/src/components/application_manager/test/application_manager_impl_test.cc b/src/components/application_manager/test/application_manager_impl_test.cc index c4ce498595..e4951880de 100644 --- a/src/components/application_manager/test/application_manager_impl_test.cc +++ b/src/components/application_manager/test/application_manager_impl_test.cc @@ -63,7 +63,9 @@ #include "utils/lock.h" #include "encryption/hashing.h" +#ifdef ENABLE_LOG #include "utils/push_log.h" +#endif namespace test { namespace components { diff --git a/src/components/config_profile/CMakeLists.txt b/src/components/config_profile/CMakeLists.txt index 4ed382039a..4b545c65ae 100644 --- a/src/components/config_profile/CMakeLists.txt +++ b/src/components/config_profile/CMakeLists.txt @@ -35,6 +35,7 @@ include_directories ( ${COMPONENTS_DIR}/utils/include/ ${POLICY_GLOBAL_INCLUDE_PATH}/ ${LOG4CXX_INCLUDE_DIRECTORY} + ${BOOST_INCLUDE_DIR} ) set(PATHS diff --git a/src/components/connection_handler/CMakeLists.txt b/src/components/connection_handler/CMakeLists.txt index fd2aa876cd..8018ea3707 100644 --- a/src/components/connection_handler/CMakeLists.txt +++ b/src/components/connection_handler/CMakeLists.txt @@ -36,6 +36,7 @@ include_directories ( ${COMPONENTS_DIR}/utils/include/ ${ENCRYPTION_INCLUDE_DIRECTORY} ${LOG4CXX_INCLUDE_DIRECTORY} + ${BOOST_INCLUDE_DIR} ) set(PATHS diff --git a/src/components/formatters/CMakeLists.txt b/src/components/formatters/CMakeLists.txt index ffd6f333e5..86483929e9 100644 --- a/src/components/formatters/CMakeLists.txt +++ b/src/components/formatters/CMakeLists.txt @@ -38,6 +38,7 @@ include_directories ( ${MESSAGE_BROKER_INCLUDE_DIRECTORY} ${COMPONENTS_DIR}/smart_objects/include ${COMPONENTS_DIR}/utils/include + ${BOOST_INCLUDE_DIR} ) set(PATHS diff --git a/src/components/interfaces/CMakeLists.txt b/src/components/interfaces/CMakeLists.txt index 3cf1082e90..ae5adc6d2a 100644 --- a/src/components/interfaces/CMakeLists.txt +++ b/src/components/interfaces/CMakeLists.txt @@ -35,6 +35,7 @@ include_directories ( ${COMPONENTS_DIR}/utils/include ${COMPONENTS_DIR}/formatters/include ${COMPONENTS_DIR}/smart_objects/include + ${BOOST_INCLUDE_DIR} ${CMAKE_BINARY_DIR} ) diff --git a/src/components/media_manager/CMakeLists.txt b/src/components/media_manager/CMakeLists.txt index 9010d15dc0..6a582b4e3b 100644 --- a/src/components/media_manager/CMakeLists.txt +++ b/src/components/media_manager/CMakeLists.txt @@ -50,6 +50,7 @@ include_directories( ${POLICY_PATH}/include/ ${POLICY_GLOBAL_INCLUDE_PATH}/ ${LOG4CXX_INCLUDE_DIRECTORY} + ${BOOST_INCLUDE_DIR} ) set(PATHS diff --git a/src/components/policy/policy_external/CMakeLists.txt b/src/components/policy/policy_external/CMakeLists.txt index c66313240f..bd05291245 100644 --- a/src/components/policy/policy_external/CMakeLists.txt +++ b/src/components/policy/policy_external/CMakeLists.txt @@ -43,6 +43,7 @@ include_directories ( ${COMPONENTS_DIR}/config_profile/include ${POLICY_GLOBAL_INCLUDE_PATH}/ ${LOG4CXX_INCLUDE_DIRECTORY} + ${BOOST_INCLUDE_DIR} ${JSONCPP_INCLUDE_DIRECTORY} ) diff --git a/src/components/policy/policy_regular/CMakeLists.txt b/src/components/policy/policy_regular/CMakeLists.txt index a5533302a5..3679b2efea 100644 --- a/src/components/policy/policy_regular/CMakeLists.txt +++ b/src/components/policy/policy_regular/CMakeLists.txt @@ -39,6 +39,7 @@ include_directories ( ${COMPONENTS_DIR}/utils/include/ ${COMPONENTS_DIR}/config_profile/include ${LOG4CXX_INCLUDE_DIRECTORY} + ${BOOST_INCLUDE_DIR} ) set(POLICY_TABLE_PATHS diff --git a/src/components/security_manager/CMakeLists.txt b/src/components/security_manager/CMakeLists.txt index 88bc1ddab4..272c7aad2f 100644 --- a/src/components/security_manager/CMakeLists.txt +++ b/src/components/security_manager/CMakeLists.txt @@ -39,6 +39,7 @@ include_directories( ${COMPONENTS_DIR}/utils/include/ ${COMPONENTS_DIR}/application_manager/include/ ${JSONCPP_INCLUDE_DIRECTORY} + ${BOOST_INCLUDE_DIR} ${APR_INCLUDE_DIRECTORY} ) diff --git a/src/components/smart_objects/CMakeLists.txt b/src/components/smart_objects/CMakeLists.txt index 84da05ce03..ef84c52ab9 100644 --- a/src/components/smart_objects/CMakeLists.txt +++ b/src/components/smart_objects/CMakeLists.txt @@ -34,6 +34,7 @@ include_directories( ${COMPONENTS_DIR}/include ${COMPONENTS_DIR}/smart_objects/include ${COMPONENTS_DIR}/utils/include + ${BOOST_INCLUDE_DIR} ) set(PATHS diff --git a/src/components/telemetry_monitor/CMakeLists.txt b/src/components/telemetry_monitor/CMakeLists.txt index bb33857ecd..093413ef3b 100644 --- a/src/components/telemetry_monitor/CMakeLists.txt +++ b/src/components/telemetry_monitor/CMakeLists.txt @@ -50,6 +50,7 @@ include_directories ( ${JSONCPP_INCLUDE_DIRECTORY} ${CMAKE_BINARY_DIR}/src/components/ ${LOG4CXX_INCLUDE_DIRECTORY} + ${BOOST_INCLUDE_DIR} ) set(PATHS diff --git a/src/components/transport_manager/CMakeLists.txt b/src/components/transport_manager/CMakeLists.txt index 286e62b795..f1edb6e298 100644 --- a/src/components/transport_manager/CMakeLists.txt +++ b/src/components/transport_manager/CMakeLists.txt @@ -41,6 +41,7 @@ include_directories ( ${POLICY_GLOBAL_INCLUDE_PATH}/ ${JSONCPP_INCLUDE_DIRECTORY} ${LOG4CXX_INCLUDE_DIRECTORY} + ${BOOST_INCLUDE_DIR} ) if (CMAKE_SYSTEM_NAME STREQUAL "QNX") diff --git a/src/components/utils/CMakeLists.txt b/src/components/utils/CMakeLists.txt index 98da4cf2ab..9562b50e78 100644 --- a/src/components/utils/CMakeLists.txt +++ b/src/components/utils/CMakeLists.txt @@ -40,6 +40,7 @@ include_directories ( ${COMPONENTS_DIR}/protocol_handler/include ${JSONCPP_INCLUDE_DIRECTORY} ${LOG4CXX_INCLUDE_DIRECTORY} + ${BOOST_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/src ) |