diff options
-rw-r--r-- | .travis.yml | 6 | ||||
-rw-r--r-- | CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/3rd_party/CMakeLists.txt | 12 | ||||
-rw-r--r-- | src/3rd_party/set_3rd_party_paths.cmake | 14 | ||||
-rw-r--r-- | src/appMain/CMakeLists.txt | 6 | ||||
-rw-r--r-- | src/components/application_manager/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/components/hmi_message_handler/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/components/hmi_message_handler/test/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/components/utils/CMakeLists.txt | 6 |
9 files changed, 28 insertions, 28 deletions
diff --git a/.travis.yml b/.travis.yml index 97740c7e1d..04d705db13 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,8 +25,12 @@ script: - ./tools/infrastructure/check_style.sh - mkdir build && cd build - export THIRD_PARTY_INSTALL_PREFIX=$HOME/.ccache + - export LD_LIBRARY_PATH=$THIRD_PARTY_INSTALL_PREFIX/lib - cmake ../ -DBUILD_TESTS=ON - - make install-3rd_party && make -j `nproc` install && sudo ldconfig && make test + - make install-3rd_party + - make -j `nproc` install + - sudo ldconfig + - make test env: global: - LC_CTYPE=en_US.UTF-8 diff --git a/CMakeLists.txt b/CMakeLists.txt index 1a180b6cf9..590281b037 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -418,8 +418,8 @@ endif() SET(RPATH_DIRECTORIES ${CMAKE_INSTALL_PREFIX}/bin/plugins - /usr/local/lib - /usr/local + ${3RD_PARTY_INSTALL_PREFIX}/lib + ${3RD_PARTY_INSTALL_PREFIX} ${CMAKE_INSTALL_PREFIX}/bin ) SET(CMAKE_SKIP_BUILD_RPATH FALSE) diff --git a/src/3rd_party/CMakeLists.txt b/src/3rd_party/CMakeLists.txt index 6c70e8988b..3072462ec4 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}) +set(BOOST_LIBRARYDIR ${3RD_PARTY_INSTALL_PREFIX}/lib) +set(BOOST_INCLUDEDIR ${3RD_PARTY_INSTALL_PREFIX}/include) find_package(Boost 1.66.0 COMPONENTS system thread) 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}) -set(BOOST_INCLUDE_DIRECTORY ${3RD_PARTY_INSTALL_PREFIX}/include ) +SET_PROPERTY(GLOBAL PROPERTY GLOBAL_BOOST_LIBS ${BOOST_LIBRARYDIR}) if (NOT ${Boost_FOUND}) message(STATUS "Did not find boost. Downloading and installing boost 1.66") set(BOOST_INSTALL_COMMAND ./b2 install) @@ -232,11 +233,8 @@ 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 + add_custom_target(Boost) # empty target, Boost is already installed endif() add_custom_target(install-3rd_party diff --git a/src/3rd_party/set_3rd_party_paths.cmake b/src/3rd_party/set_3rd_party_paths.cmake index 6213b1a9f2..92994274c2 100644 --- a/src/3rd_party/set_3rd_party_paths.cmake +++ b/src/3rd_party/set_3rd_party_paths.cmake @@ -28,27 +28,27 @@ # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. -set(3RD_PARTY_INSTALL_PREFIX "$ENV{THIRD_PARTY_INSTALL_PREFIX}") +set(3RD_PARTY_INSTALL_PREFIX "$ENV{THIRD_PARTY_INSTALL_PREFIX}" CACHE INTERNAL "3rd Party installation prefix" FORCE) set(USE_DEFAULT_3RD_PARTY_PATH "true") if(3RD_PARTY_INSTALL_PREFIX) set(USE_DEFAULT_3RD_PARTY_PATH "false") - set(3RD_PARTY_INSTALL_PREFIX_ARCH "$ENV{THIRD_PARTY_INSTALL_PREFIX_ARCH}") + set(3RD_PARTY_INSTALL_PREFIX_ARCH "$ENV{THIRD_PARTY_INSTALL_PREFIX_ARCH}" CACHE INTERNAL "3rd Party library installation prefix" FORCE) if(3RD_PARTY_INSTALL_PREFIX_ARCH) else() - set(3RD_PARTY_INSTALL_PREFIX_ARCH ${3RD_PARTY_INSTALL_PREFIX}) + set(3RD_PARTY_INSTALL_PREFIX_ARCH ${3RD_PARTY_INSTALL_PREFIX} CACHE INTERNAL "3rd Party library installation prefix" FORCE) endif() else() if(CMAKE_SYSTEM_NAME STREQUAL "QNX") - set(3RD_PARTY_INSTALL_PREFIX "$ENV{QNX_TARGET}/usr") + set(3RD_PARTY_INSTALL_PREFIX "$ENV{QNX_TARGET}/usr" CACHE INTERNAL "3rd Party installation prefix" FORCE) if(CMAKE_SYSTEM_PROCESSOR STREQUAL "armv7") set(QNX_ARCH "armle-v7") else() set(QNX_ARCH ${CMAKE_SYSTEM_PROCESSOR}) endif() - set(3RD_PARTY_INSTALL_PREFIX_ARCH "$ENV{QNX_TARGET}/${QNX_ARCH}/usr") + set(3RD_PARTY_INSTALL_PREFIX_ARCH "$ENV{QNX_TARGET}/${QNX_ARCH}/usr" CACHE INTERNAL "3rd Party library installation prefix" FORCE) else() - set(3RD_PARTY_INSTALL_PREFIX "/usr/local") - set(3RD_PARTY_INSTALL_PREFIX_ARCH ${3RD_PARTY_INSTALL_PREFIX}) + set(3RD_PARTY_INSTALL_PREFIX "/usr/local" CACHE INTERNAL "3rd Party installation prefix""3rd Party installation prefix" FORCE) + set(3RD_PARTY_INSTALL_PREFIX_ARCH ${3RD_PARTY_INSTALL_PREFIX} CACHE INTERNAL "3rd Party library installation prefix" FORCE) endif() endif() diff --git a/src/appMain/CMakeLists.txt b/src/appMain/CMakeLists.txt index fe9a6af3f7..5a618c2bdb 100644 --- a/src/appMain/CMakeLists.txt +++ b/src/appMain/CMakeLists.txt @@ -69,7 +69,7 @@ include_directories( ${OPENSSL_INCLUDE_DIRECTORY} ${default_media_inc} ${MESSAGE_BROKER_INCLUDE_DIRECTORY} - ${BOOST_INCLUDE_DIR} + ${BOOST_INCLUDEDIR} ${CMAKE_SOURCE_DIR}/src ) @@ -151,8 +151,8 @@ add_executable(${PROJECT} ${SOURCES}) if (HMIADAPTER STREQUAL "messagebroker") add_dependencies(${PROJECT} Boost) - GET_PROPERTY(BOOST_LIBS_DIRECTORY GLOBAL PROPERTY GLOBAL_BOOST_LIBS) - list(APPEND LIBRARIES boost_system -L${BOOST_LIBS_DIRECTORY}) + GET_PROPERTY(BOOST_LIBRARYDIRECTORY GLOBAL PROPERTY GLOBAL_BOOST_LIBS) + list(APPEND LIBRARIES boost_system -L${BOOST_LIBRARYDIRECTORY}) endif() target_link_libraries(${PROJECT} ${LIBRARIES}) diff --git a/src/components/application_manager/CMakeLists.txt b/src/components/application_manager/CMakeLists.txt index 67a7136a62..3888a68e37 100644 --- a/src/components/application_manager/CMakeLists.txt +++ b/src/components/application_manager/CMakeLists.txt @@ -141,8 +141,6 @@ set(LIBRARIES formatters dbms Utils - bson -L${BSON_LIBS_DIRECTORY} - emhashmap -L${EMHASHMAP_LIBS_DIRECTORY} ) diff --git a/src/components/hmi_message_handler/CMakeLists.txt b/src/components/hmi_message_handler/CMakeLists.txt index 8fafee1ac5..5776fb34a9 100644 --- a/src/components/hmi_message_handler/CMakeLists.txt +++ b/src/components/hmi_message_handler/CMakeLists.txt @@ -47,7 +47,7 @@ include_directories ( ${LOG4CXX_INCLUDE_DIRECTORY} ${COMPONENTS_DIR}/hmi_message_handler/include ${COMPONENTS_DIR}/hmi_message_handler/src - ${BOOST_INCLUDE_DIR} + ${BOOST_INCLUDEDIR} ) set(PATHS diff --git a/src/components/hmi_message_handler/test/CMakeLists.txt b/src/components/hmi_message_handler/test/CMakeLists.txt index 6d30d6ee51..c2a83bb297 100644 --- a/src/components/hmi_message_handler/test/CMakeLists.txt +++ b/src/components/hmi_message_handler/test/CMakeLists.txt @@ -55,8 +55,8 @@ set(LIBRARIES collect_sources(SOURCES "${CMAKE_CURRENT_SOURCE_DIR}" "${EXCLUDE_PATHS}") if (HMIADAPTER STREQUAL "messagebroker") - GET_PROPERTY(BOOST_LIBS_DIRECTORY GLOBAL PROPERTY GLOBAL_BOOST_LIBS) - list(APPEND LIBRARIES boost_system -L${BOOST_LIBS_DIRECTORY}) + GET_PROPERTY(BOOST_LIBRARYDIRECTORY GLOBAL PROPERTY GLOBAL_BOOST_LIBS) + list(APPEND LIBRARIES boost_system -L${BOOST_LIBRARYDIRECTORY}) endif() create_test(hmi_message_handler_test "${SOURCES}" "${LIBRARIES}") diff --git a/src/components/utils/CMakeLists.txt b/src/components/utils/CMakeLists.txt index a6ded9a186..3177220de4 100644 --- a/src/components/utils/CMakeLists.txt +++ b/src/components/utils/CMakeLists.txt @@ -115,9 +115,9 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") endif() add_library("Utils" ${SOURCES}) -GET_PROPERTY(BOOST_LIBS_DIRECTORY GLOBAL PROPERTY GLOBAL_BOOST_LIBS) -list(APPEND LIBRARIES boost_system -L${BOOST_LIBS_DIRECTORY}) -list(APPEND LIBRARIES boost_thread -L${BOOST_LIBS_DIRECTORY}) +GET_PROPERTY(BOOST_LIBRARYDIRECTORY GLOBAL PROPERTY GLOBAL_BOOST_LIBS) +list(APPEND LIBRARIES boost_system -L${BOOST_LIBRARYDIRECTORY}) +list(APPEND LIBRARIES boost_thread -L${BOOST_LIBRARYDIRECTORY}) target_link_libraries("Utils" ${LIBRARIES}) add_dependencies("Utils" Boost) |