From 9a340fb7f6e1501b030d222408e798f6a72f47e4 Mon Sep 17 00:00:00 2001 From: Mohammad Al-Turany Date: Tue, 29 Mar 2016 15:31:29 +0200 Subject: [PATCH] Use Variables for Boost libraries instead of explicit names Use the vairables filled by FindBoost instead explicit names in the cmake files --- fairmq/CMakeLists.txt | 17 ++++++++--------- fairmq/logger/CMakeLists.txt | 13 +++++++------ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/fairmq/CMakeLists.txt b/fairmq/CMakeLists.txt index cc634416..6dc42883 100644 --- a/fairmq/CMakeLists.txt +++ b/fairmq/CMakeLists.txt @@ -116,16 +116,15 @@ Install(FILES ${FAIRMQHEADERS} DESTINATION include) Set(DEPENDENCIES ${DEPENDENCIES} ${ZMQ_LIBRARY_SHARED} - boost_thread + ${Boost_THREAD_LIBRARY} fairmq_logger - boost_timer - boost_system - boost_filesystem - boost_program_options - boost_random - boost_chrono - boost_exception - boost_regex + ${Boost_TIMER_LIBRARY} + ${Boost_SYSTEM_LIBRARY} + ${Boost_FILESYSTEM_LIBRARY} + ${Boost_PROGRAM_OPTIONS_LIBRARY} + ${Boost_RANDOM_LIBRARY} + ${Boost_CHRONO_LIBRARY} + ${Boost_REGEX_LIBRARY} ) If(NANOMSG_FOUND) diff --git a/fairmq/logger/CMakeLists.txt b/fairmq/logger/CMakeLists.txt index 896b84a5..dde4b2ff 100644 --- a/fairmq/logger/CMakeLists.txt +++ b/fairmq/logger/CMakeLists.txt @@ -26,12 +26,13 @@ set(SRCS logger.cxx) set(LIBRARY_NAME fairmq_logger) set(DEPENDENCIES - boost_log - boost_log_setup - boost_thread - boost_date_time - boost_filesystem - boost_system + ${Boost_LOG_LIBRARY} + ${Boost_LOG_SETUP_LIBRARY} + ${Boost_THREAD_LIBRARY} + ${Boost_THREAD_LIBRARY} + ${Boost_DATE_TIME_LIBRARY} + ${Boost_FILESYSTEM_LIBRARY} + ${Boost_SYSTEM_LIBRARY} pthread )