Extraction of RORC and InfoLogger

Author: Barthelemy

CMakeLists.txt

@@ -67,9 +67,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic -Wextra -fPIC")
 # Module, library and executable definition
 ####################################
 
-link_o2_subproject(InfoLogger)
 link_o2_subproject(DataFormat)
-link_o2_subproject(ReadoutCard)
 link_o2_subproject(DataSampling)
 
 set(MODULE_NAME "Readout")
@@ -97,6 +95,8 @@ include_directories(
         ${FAIRROOT_INCLUDE_DIR}/fairmq
         ${ZeroMQ_INCLUDE_DIR}
         ${Common_INCLUDE_DIRS}
+        ${InfoLogger_INCLUDE_DIRS}
+        ${ReadoutCard_INCLUDE_DIRS}
 )
 
 add_library(

cmake/ReadoutDependencies.cmake

@@ -4,54 +4,58 @@ find_package(FairRoot)
 find_package(Monitoring REQUIRED)
 find_package(Configuration REQUIRED)
 find_package(Common REQUIRED)
+find_package(InfoLogger REQUIRED)
+find_package(ReadoutCard REQUIRED)
 
-if(FAIRROOT_FOUND)
+if (FAIRROOT_FOUND)
     # this should go away when fairrot provides a proper Find script or proper config scripts
     # See : http://www.cmake.org/cmake/help/v3.0/command/link_directories.html
     link_directories(${FAIRROOT_LIBRARY_DIR})
     set(FAIRROOT_LIBRARIES Base FairMQ BaseMQ)
     ADD_DEFINITIONS(-DWITH_FAIRMQ)
-else(FAIRROOT_FOUND)
+else (FAIRROOT_FOUND)
     message(WARNING "FairRoot not found, corresponding classes will not be compiled.")
-endif(FAIRROOT_FOUND)
+endif (FAIRROOT_FOUND)
 
 ADD_DEFINITIONS(-DWITH_DATASAMPLING)
 
 o2_define_bucket(
-  NAME
-  o2_readout_bucket
-
-  DEPENDENCIES
-  InfoLogger
-  pthread
-  DataFormat
-  ReadoutCard
-  DataSampling
-  ${Configuration_LIBRARIES}
-  ${Monitoring_LIBRARIES}
-  ${Common_LIBRARIES}
-
-  SYSTEMINCLUDE_DIRECTORIES
-  ${Boost_INCLUDE_DIRS}
-  ${Monitoring_INCLUDE_DIRS}
+        NAME
+        o2_readout_bucket
+
+        DEPENDENCIES
+        pthread
+        DataFormat
+        DataSampling
+        ${Configuration_LIBRARIES}
+        ${Monitoring_LIBRARIES}
+        ${Common_LIBRARIES}
+        ${InfoLogger_LIBRARIES}
+        ${ReadoutCard_LIBRARIES}
+
+        SYSTEMINCLUDE_DIRECTORIES
+        ${Boost_INCLUDE_DIRS}
+        ${Monitoring_INCLUDE_DIRS}
+        ${InfoLogger_INCLUDE_DIRS}
+        ${ReadoutCard_INCLUDE_DIRS}
 )
 
 
 o2_define_bucket(
-  NAME
-  o2_readout_with_fair
-
-  DEPENDENCIES
-  o2_readout_bucket
-  ${Boost_PROGRAM_OPTIONS_LIBRARY}
-  ${Boost_LOG_LIBRARY}
-  ${Boost_THREAD_LIBRARY}
-  ${Boost_SYSTEM_LIBRARY}
-  ${FAIRROOT_LIBRARIES}
-  ${ROOT_LIBRARIES}
-
-  SYSTEMINCLUDE_DIRECTORIES
-  ${FAIRROOT_INCLUDE_DIR}
-  ${FAIRROOT_INCLUDE_DIR}/fairmq
+        NAME
+        o2_readout_with_fair
+
+        DEPENDENCIES
+        o2_readout_bucket
+        ${Boost_PROGRAM_OPTIONS_LIBRARY}
+        ${Boost_LOG_LIBRARY}
+        ${Boost_THREAD_LIBRARY}
+        ${Boost_SYSTEM_LIBRARY}
+        ${FAIRROOT_LIBRARIES}
+        ${ROOT_LIBRARIES}
+
+        SYSTEMINCLUDE_DIRECTORIES
+        ${FAIRROOT_INCLUDE_DIR}
+        ${FAIRROOT_INCLUDE_DIR}/fairmq
 )