Fixes needed for FairROOT's split (#24)

Author: Barthelemy

Framework/src/InformationService.cxx

@@ -16,7 +16,8 @@
 
 #include "InformationService.h"
 #include "QualityControl/QcInfoLogger.h"
-#include <options/FairMQProgOptions.h>
+#include <boost/token_functions.hpp>
+#include <boost/tokenizer.hpp>
 
 using namespace std;
 typedef boost::tokenizer<boost::char_separator<char> > t_tokenizer;

Framework/src/SpyMainFrame.cxx

@@ -25,6 +25,7 @@
 #include <QualityControl/DatabaseFactory.h>
 #include <Configuration/ConfigurationFactory.h>
 #include <TGraph.h>
+#include <boost/algorithm/string.hpp>
 
 using namespace std;
 using namespace o2::quality_control::repository;

cmake/FindFairMQInFairRoot.cmake

@@ -0,0 +1,54 @@
+# DEPRECATED: Remove this file, once we require FairMQ 1.2+
+#
+# Simple check for availability of FairMQ
+#
+# The FairMQ module of FairRoot might be disabled in the built of FairRoot
+# due to missing dependencies, e.g ZeroMQ and boost. Those dependencies
+# also have to be available in the required (minimal) version.
+#
+
+if(FairRoot_DIR)
+  set(FAIRROOTPATH ${FairRoot_DIR})
+else()
+  set(FAIRROOTPATH $ENV{FAIRROOTPATH})
+endif(FairRoot_DIR)
+
+if(FAIRROOTPATH)
+  if(NOT FairMQInFairRoot_FIND_QUIETLY)
+  MESSAGE(STATUS "FairRoot ... - found ${FAIRROOTPATH}")
+  endif(NOT FairMQInFairRoot_FIND_QUIETLY)
+else()
+  if(NOT FairMQInFairRoot_FIND_QUIETLY)
+  MESSAGE(FATAL_ERROR "FairRoot installation not found")
+  endif(NOT FairMQInFairRoot_FIND_QUIETLY)
+endif(FAIRROOTPATH)
+
+set(FAIRMQ_REQUIRED_HEADERS FairMQDevice.h)
+if(NOT FairMQInFairRoot_FIND_QUIETLY)
+  message(STATUS "Looking for FairMQ functionality in FairRoot ...")
+endif(NOT FairMQInFairRoot_FIND_QUIETLY)
+
+find_path(FAIRMQ_INCLUDE_DIR NAMES ${FAIRMQ_REQUIRED_HEADERS}
+  PATHS ${FAIRROOTPATH}/include/fairmq
+  NO_DEFAULT_PATH
+)
+
+# search once more in the system if not yet found
+find_path(FAIRMQ_INCLUDE_DIR NAMES ${FAIRMQ_REQUIRED_HEADERS}
+)
+
+if(FAIRMQ_INCLUDE_DIR)
+  if(NOT FairMQInFairRoot_FIND_QUIETLY)
+    message(STATUS "Looking for FairMQ functionality in FairRoot: yes")
+  endif(NOT FairMQInFairRoot_FIND_QUIETLY)
+  set(FAIRMQ_FOUND TRUE)
+  set(FairMQInFairRoot_FOUND TRUE)
+else(FAIRMQ_INCLUDE_DIR)
+  if(FairMQInFairRoot_FIND_REQUIRED)
+    message(FATAL_ERROR "FairRoot is not built with FairMQ support")
+  else(FairMQInFairRoot_FIND_REQUIRED)
+    if(NOT FairMQInFairRoot_FIND_QUIETLY)
+      message(STATUS "Looking for FairMQ functionality in FairRoot: no")
+    endif(NOT FairMQInFairRoot_FIND_QUIETLY)
+  endif(FairMQInFairRoot_FIND_REQUIRED)
+endif(FAIRMQ_INCLUDE_DIR)

cmake/QualityControlDependencies.cmake

@@ -1,8 +1,7 @@
-find_package(Boost 1.58 COMPONENTS container unit_test_framework program_options system log)
+find_package(Boost 1.58 COMPONENTS container unit_test_framework program_options system log signals )
 find_package(Git QUIET)
 find_package(Configuration REQUIRED)
 find_package(Monitoring REQUIRED)
-find_package(FairRoot REQUIRED)
 find_package(MySQL REQUIRED)
 find_package(Common REQUIRED)
 find_package(InfoLogger REQUIRED)
@@ -20,8 +19,17 @@ if (BOOST_FOUND AND NOT Boost_FOUND)
     set(Boost_FOUND 1)
 endif ()
 
+find_package(FairRoot REQUIRED)
+find_package(FairMQInFairRoot) # DEPRECATED: This looks for FairMQ embedded in old FairRoot versions,
+# before FairMQ and FairLogger have moved to separate repos.
+# Remove this line, once we require FairMQ 1.2+.
+if(NOT FairMQInFairRoot_FOUND) # DEPRECATED: Remove this condition, once we require FairMQ 1.2+
+    find_package(FairMQ REQUIRED)
+    find_package(FairLogger REQUIRED)
+endif()
+
+
 link_directories(${FAIRROOT_LIBRARY_DIR})
-set(FAIRROOT_LIBRARIES Base FairMQ BaseMQ Logger)
 
 if (NOT MYSQL_FOUND)
     message(WARNING "MySQL not found, the corresponding classes won't be built.")
@@ -32,6 +40,25 @@ else ()
 #    set(ROOT_LIBRARIES "${ROOT_LIBRARIES} -lRMySQL")
 endif ()
 
+get_target_property(_boost_incdir Boost::boost INTERFACE_INCLUDE_DIRECTORIES)
+
+
+if(FairMQInFairRoot_FOUND)
+    # DEPRECATED: Remove this case, once we require FairMQ 1.2+
+    get_target_property(_fairmq_incdir FairRoot::FairMQ INTERFACE_INCLUDE_DIRECTORIES)
+    o2_define_bucket(NAME fairmq_bucket
+            DEPENDENCIES FairRoot::FairMQ
+            INCLUDE_DIRECTORIES ${_boost_incdir} ${_fairmq_incdir}
+            )
+else()
+    get_target_property(_fairmq_incdir FairMQ::FairMQ INTERFACE_INCLUDE_DIRECTORIES)
+    get_target_property(_fairlogger_incdir FairLogger::FairLogger INTERFACE_INCLUDE_DIRECTORIES)
+    o2_define_bucket(NAME fairmq_bucket
+            DEPENDENCIES FairMQ::FairMQ
+            INCLUDE_DIRECTORIES ${_boost_incdir} ${_fairmq_incdir} ${_fairlogger_incdir}
+            )
+    set(_fairlogger_incdir)
+endif()
 
 o2_define_bucket(
         NAME
@@ -76,7 +103,7 @@ o2_define_bucket(
 
         DEPENDENCIES
         o2_qualitycontrol_bucket
-        ${FAIRROOT_LIBRARIES}
+        fairmq_bucket
 
         SYSTEMINCLUDE_DIRECTORIES
         ${FAIRROOT_INCLUDE_DIR}
@@ -141,7 +168,7 @@ o2_define_bucket(
 
         DEPENDENCIES
         o2_qcmodules_base
-        ${FAIRROOT_LIBRARIES}
+        fairmq_bucket
         ${AliceO2_LIBRARIES}
 
         SYSTEMINCLUDE_DIRECTORIES