OMON-59

Fix for the build of Monitoring.

The Monitoring would not see apmon when built with alibuild.

Author: Barthelemy

cmake/FindAPMON.cmake

@@ -6,22 +6,25 @@
 #  APMON_INCLUDE_DIRS - The ApMon include directories
 #  APMON_LIBRARIES - The libraries needed to use ApMon
 #  APMON_DEFINITIONS - Compiler switches required for using ApMon
+# This script can use the following variables:
+#  APMON_ROOT - Installation root to tell this module where to look.
 
 # Init
 include(FindPackageHandleStandardArgs)
 
 # find includes
 find_path(APMON_INCLUDE_DIR ApMon.h
-          PATHS /usr/local/include)
+        HINTS ${APMON_ROOT}/include
+        PATHS /usr/local/include)
 set(APMON_INCLUDE_DIRS ${APMON_INCLUDE_DIR})
 
 # find library
-find_library(APMON_LIBRARY NAMES apmoncpp HINTS /usr/local)
+find_library(APMON_LIBRARY NAMES apmoncpp HINTS /usr/local ${APMON_ROOT}/lib)
 set(APMON_LIBRARIES ${APMON_LIBRARY})
 
 # handle the QUIETLY and REQUIRED arguments and set APMON_FOUND to TRUE
 # if all listed variables are TRUE
-find_package_handle_standard_args(APMON  "ApMon could not be found. Install package ApMon_cpp."
-                                  APMON_LIBRARY APMON_INCLUDE_DIR)
+find_package_handle_standard_args(APMON "ApMon could not be found. Install package ApMon_cpp."
+        APMON_LIBRARY APMON_INCLUDE_DIR)
 
 mark_as_advanced(APMON_INCLUDE_DIR APMON_LIBRARY)

cmake/MonitoringDependencies.cmake

@@ -5,25 +5,29 @@ find_package(CURL)
 find_package(Configuration REQUIRED)
 
 set(extra_deps "")
-if(APMON_FOUND)
+set(extra_deps_include "")
+if (APMON_FOUND)
     list(APPEND extra_deps ${APMON_LIBRARIES})
-endif()
-if(CURL_FOUND)
+    list(APPEND extra_deps_include ${APMON_INCLUDE_DIRS})
+endif ()
+if (CURL_FOUND)
     list(APPEND extra_deps ${CURL_LIBRARIES})
-endif()
+    list(APPEND extra_deps_include ${CURL_INCLUDE_DIRS})
+endif ()
 
 o2_define_bucket(
-        NAME
-        o2_monitoring_bucket
+    NAME
+    o2_monitoring_bucket
 
-        DEPENDENCIES
-        ${Configuration_LIBRARIES}
-        ${Boost_SYSTEM_LIBRARY}
-        ${Boost_FILESYSTEM_LIBRARY}
-        ${Boost_PROGRAM_OPTIONS_LIBRARY}
-        ${extra_deps}
+    DEPENDENCIES
+    ${Configuration_LIBRARIES}
+    ${Boost_SYSTEM_LIBRARY}
+    ${Boost_FILESYSTEM_LIBRARY}
+    ${Boost_PROGRAM_OPTIONS_LIBRARY}
+    ${extra_deps}
 
-        SYSTEMINCLUDE_DIRECTORIES
-        ${Boost_INCLUDE_DIRS}
-        ${Configuration_INCLUDE_DIRS}
+    SYSTEMINCLUDE_DIRECTORIES
+    ${Boost_INCLUDE_DIRS}
+    ${Configuration_INCLUDE_DIRS}
+    ${extra_deps_include}
 )