Extraction of RORC and InfoLogger

Author: Barthelemy

CMakeLists.txt

@@ -36,8 +36,6 @@ macro(PrintModuleName name)
   message(STATUS \n-------- ${name} --------)
 endmacro()
 
-PrintModuleName("InfoLogger")
-add_subdirectory(InfoLogger)
 PrintModuleName("DataFormat")
 add_subdirectory(DataFormat)
 PrintModuleName("DataSampling")
@@ -48,8 +46,6 @@ PrintModuleName("QualityControl")
 add_subdirectory(QualityControl)
 PrintModuleName("QualityControlModules")
 add_subdirectory(QualityControlModules)
-PrintModuleName("RORC")
-add_subdirectory(RORC)
 PrintModuleName("Readout")
 add_subdirectory(Readout)
 PrintModuleName("GUI")

Control/CMakeLists.txt

@@ -62,8 +62,6 @@ ENDIF ()
 # Add compiler flags for warnings and (more importantly) fPIC and debug symbols
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic -Wextra -fPIC")
 
-link_o2_subproject(InfoLogger)
-
 add_subdirectory(StateMachine)
 add_subdirectory(ControlFairMQ)
 

Control/cmake/ControlDependencies.cmake

@@ -3,9 +3,8 @@ find_package(Git QUIET)
 find_package(Zookeeper)
 find_package(FairRoot)
 find_package(Common REQUIRED)
+find_package(InfoLogger REQUIRED)
 
-## TODO this should relaly not be needed
-#FIND_LIBRARY(ZMQ_LIB zmq)
 # TODO is it needed ?
 if(BOOST_FOUND OR Boost_FOUND)
     set(BOOST_FOUND 1)
@@ -29,11 +28,13 @@ o2_define_bucket(
         pthread
         ${Zookeeper_LIBRARIES}
         ${Common_LIBRARIES}
+        ${InfoLogger_LIBRARIES}
 
         SYSTEMINCLUDE_DIRECTORIES
         ${Boost_INCLUDE_DIRS}
         ${Zookeeper_INCLUDE_DIRS}
         ${Common_INCLUDE_DIRS}
+        ${InfoLogger_INCLUDE_DIRS}
 )
 
 o2_define_bucket(
@@ -54,11 +55,12 @@ o2_define_bucket(
 
         DEPENDENCIES
         ${Common_LIBRARIES}
-        InfoLogger
         ${Boost_LOG_LIBRARY}
         ${Boost_THREAD_LIBRARY}
         ${Boost_SYSTEM_LIBRARY}
+        ${Boost_PROGRAM_OPTIONS_LIBRARY}
         ${FAIRROOT_LIBRARIES}
+        ${InfoLogger_LIBRARIES}
         pthread
         dl
 
@@ -68,4 +70,5 @@ o2_define_bucket(
         ${FAIRROOT_INCLUDE_DIR}
         ${FAIRROOT_INCLUDE_DIR}/fairmq
         ${Common_INCLUDE_DIRS}
+        ${InfoLogger_INCLUDE_DIRS}
 )

DataSampling/CMakeLists.txt

@@ -64,7 +64,6 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic -Wextra -fPIC")
 set(MODULE_NAME "DataSampling")
 
 link_o2_subproject(DataFormat)
-link_o2_subproject(InfoLogger)
 
 O2_SETUP(NAME ${MODULE_NAME})
 

DataSampling/cmake/DataSamplingDependencies.cmake

@@ -1,6 +1,7 @@
 find_package(Boost 1.59 COMPONENTS thread system timer program_options random filesystem chrono exception regex serialization log log_setup unit_test_framework date_time REQUIRED)
 find_package(FairRoot)
 find_package(Common REQUIRED)
+find_package(InfoLogger REQUIRED)
 
 if(FAIRROOT_FOUND)
     # this should go away when fairrot provides a proper Find script or proper config scripts
@@ -23,13 +24,14 @@ o2_define_bucket(
   ${Boost_SYSTEM_LIBRARY_DEBUG}
   ${Boost_LOG_LIBRARY_DEBUG}
   ${Boost_FILESYSTEM_LIBRARY}
-  InfoLogger
   ${Common_LIBRARIES}
   DataFormat
+  ${InfoLogger_LIBRARIES}
 
   SYSTEMINCLUDE_DIRECTORIES
   ${Boost_INCLUDE_DIRS}
   ${Common_INCLUDE_DIRS}
+  ${InfoLogger_INCLUDE_DIRS}
 )
 
 o2_define_bucket(

GUI/CMakeLists.txt

@@ -26,8 +26,6 @@ include(O2Utils)
 include(GuiDependencies)
 include(O2) # to be removed
 
-link_o2_subproject(InfoLogger)
-
 # Set the default build type to "RelWithDebInfo"
 if(NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE "RelWithDebInfo"

GUI/cmake/GuiDependencies.cmake

@@ -1,6 +1,8 @@
 find_package(Boost COMPONENTS unit_test_framework program_options log thread system REQUIRED)
 find_package(Git QUIET)
 find_package(ZeroMQ REQUIRED)
+find_package(InfoLogger REQUIRED)
+
 # because FindZeroMQ.cmake differs from system to system.
 if(NOT ZeroMQ_INCLUDE_DIR)
     set(ZeroMQ_INCLUDE_DIR ${ZEROMQ_INCLUDE_DIR})
@@ -23,11 +25,12 @@ o2_define_bucket(
 
         DEPENDENCIES
         ${ZeroMQ_LIBRARIES}
-        InfoLogger
+        ${InfoLogger_LIBRARIES}
 
         SYSTEMINCLUDE_DIRECTORIES
         ${Boost_INCLUDE_DIRS}
         ${ZeroMQ_INCLUDE_DIR}
+        ${InfoLogger_INCLUDE_DIRS}
 )
 
 o2_define_bucket(
@@ -40,6 +43,7 @@ o2_define_bucket(
         ${Boost_THREAD_LIBRARY}
         ${Boost_LOG_LIBRARY}
         ${Boost_SYSTEM_LIBRARY}
+        ${Boost_PROGRAM_OPTIONS_LIBRARY}
         pthread
         dl