diff options
| author | JackLivio <jack@livio.io> | 2018-08-29 14:08:41 -0400 |
|---|---|---|
| committer | JackLivio <jack@livio.io> | 2018-08-29 14:08:41 -0400 |
| commit | cee3ba5cec980dcee4cc37af71bd09dc306d3867 (patch) | |
| tree | 3f22a7132d77dde142019231bf10ab2e3be1f5dd /src/components/utils/CMakeLists.txt | |
| parent | 90db9ca480eabeaf85ec77626b1bf10fa491270d (diff) | |
| parent | 09e4e684708ad5ab2544c72745516e9fe481ba0b (diff) | |
| download | sdl_core-cee3ba5cec980dcee4cc37af71bd09dc306d3867.tar.gz | |
Merge remote-tracking branch 'origin/develop' into feature/boost_filesystem_implementation
# Conflicts:
# src/3rd_party/CMakeLists.txt
# src/components/utils/CMakeLists.txt
Diffstat (limited to 'src/components/utils/CMakeLists.txt')
| -rw-r--r-- | src/components/utils/CMakeLists.txt | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/components/utils/CMakeLists.txt b/src/components/utils/CMakeLists.txt index e2d7546dc8..98da4cf2ab 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} + ${CMAKE_SOURCE_DIR}/src ) # dbms @@ -114,8 +115,11 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") endif() add_library("Utils" ${SOURCES}) - -list(APPEND LIBRARIES -lboost_system -lboost_thread -lboost_filesystem) +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}) +list(APPEND LIBRARIES boost_date_time -L${BOOST_LIBS_DIRECTORY}) +list(APPEND LIBRARIES boost_filesystem -L${BOOST_LIBS_DIRECTORY}) target_link_libraries("Utils" ${LIBRARIES}) add_dependencies("Utils" Boost) |