From c041c143735a4f9836a6242b8565588b07d91610 Mon Sep 17 00:00:00 2001 From: Alexey Rybalchenko Date: Wed, 22 Jan 2014 09:57:59 +0100 Subject: [PATCH] cmake - use set(INCLUDE_DIRECTORIES) --- fairmq/CMakeLists.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/fairmq/CMakeLists.txt b/fairmq/CMakeLists.txt index ef19b1e4..205406b1 100644 --- a/fairmq/CMakeLists.txt +++ b/fairmq/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories( +set(INCLUDE_DIRECTORIES ${BASE_INCLUDE_DIRECTORIES} ${CMAKE_SOURCE_DIR}/fairmq ${ZMQ_INCLUDE_DIR} @@ -7,6 +7,8 @@ include_directories( ${ROOT_INCLUDE_DIR} ) +include_directories(${INCLUDE_DIRECTORIES}) + Set(LINK_DIRECTORIES ${ROOT_LIBRARY_DIR} ${Boost_LIBRARY_DIRS} @@ -40,8 +42,6 @@ Set(SRCS "FairMQProxy.cxx" ) -Set(LIBRARY_NAME FairMQ) - Set(DEPENDENCIES ${CMAKE_THREAD_LIBS_INIT} ${ZMQ_LIBRARY_SHARED} @@ -49,6 +49,8 @@ Set(DEPENDENCIES Base ParBase FairTools GeoBase boost_thread boost_timer boost_system ) +Set(LIBRARY_NAME FairMQ) + GENERATE_LIBRARY() Set(Exe_Names bsampler buffer splitter merger sink proxy n_one_merger one_n_splitter)