Modifications to be able to build readoutcard with alibuild

Author: Barthelemy

.gitignore

@@ -1,4 +1,5 @@
 build
 .idea
 .project
-.cproject
+.cproject
+cmake-build-*

CMakeLists.txt

@@ -24,7 +24,6 @@ project(ReadoutCard)
 # Load some basic macros which are needed later on
 include(O2Utils)
 include(ReadoutCardDependencies)
-include(O2)
 
 # Set the default build type to "RelWithDebInfo"
 if(NOT CMAKE_BUILD_TYPE)
@@ -63,8 +62,6 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic -Wextra -fPIC")
 
 set(MODULE_NAME "ReadoutCard")
 
-link_o2_subproject(InfoLogger)
-
 O2_SETUP(NAME ${MODULE_NAME})
 
 set(SRCS
@@ -190,7 +187,7 @@ endif()
 
 add_subdirectory(doc)
 
-set(CTEST_TESTING_TIMEOUT 15)
+enable_testing()
 
 set(TEST_SRCS
   test/TestBarAccessor.cxx
@@ -210,18 +207,10 @@ set(TEST_SRCS
 O2_GENERATE_TESTS(
  MODULE_LIBRARY_NAME ${LIBRARY_NAME}
  BUCKET_NAME ${BUCKET_NAME}
- TIMEOUT 30
+ TIMEOUT 15
  TEST_SRCS ${TEST_SRCS}
 )
 
-# TODO RECONSIDER THE THINGS BELOW AFTER EXTRACTION TO ITS OWN REPO
-# Make sure we tell the topdir CMakeLists that we exist (if build from topdir)
-get_directory_property(hasParent PARENT_DIRECTORY)
-if(hasParent)
-    set(PROJECT_${PROJECT_NAME} true PARENT_SCOPE)
-endif()
-include(PackageConfigurator)
-
 # Install the hugetlbfs script separately, because it's not a compiled target
 install(
   FILES src/roc-setup-hugetlbfs.sh

cmake/FindInfoLogger.cmake

@@ -0,0 +1,36 @@
+# - Try to find the O2 InfoLogger package include dirs and libraries
+# Author: Barthelemy von Haller
+#
+# This script will set the following variables:
+#  InfoLogger_FOUND - System has InfoLogger
+#  InfoLogger_INCLUDE_DIRS - The InfoLogger include directories
+#  InfoLogger_LIBRARIES - The libraries needed to use InfoLogger
+#  InfoLogger_DEFINITIONS - Compiler switches required for using InfoLogger
+#
+# This script can use the following variables:
+#  InfoLogger_ROOT - Installation root to tell this module where to look. (it tries LD_LIBRARY_PATH otherwise)
+
+# Init
+include(FindPackageHandleStandardArgs)
+
+# find includes
+find_path(INFOLOGGER_INCLUDE_DIR InfoLogger.h
+        HINTS ${InfoLogger_ROOT}/include ENV LD_LIBRARY_PATH PATH_SUFFIXES "../include/InfoLogger" "../../include/InfoLogger" )
+# Remove the final "InfoLogger"
+get_filename_component(INFOLOGGER_INCLUDE_DIR ${INFOLOGGER_INCLUDE_DIR} DIRECTORY)
+set(InfoLogger_INCLUDE_DIRS ${INFOLOGGER_INCLUDE_DIR})
+
+# find library
+find_library(INFOLOGGER_LIBRARY NAMES InfoLogger HINTS ${InfoLogger_ROOT}/lib ENV LD_LIBRARY_PATH)
+set(InfoLogger_LIBRARIES ${INFOLOGGER_LIBRARY})
+
+# handle the QUIETLY and REQUIRED arguments and set INFOLOGGER_FOUND to TRUE
+# if all listed variables are TRUE
+find_package_handle_standard_args(InfoLogger  "InfoLogger could not be found. Install package InfoLogger or set InfoLogger_ROOT to its root installation directory."
+        INFOLOGGER_LIBRARY INFOLOGGER_INCLUDE_DIR)
+
+if(${InfoLogger_ROOT})
+    message(STATUS "InfoLogger found : ${InfoLogger_LIBRARIES}")
+endif()
+
+mark_as_advanced(INFOLOGGER_INCLUDE_DIR INFOLOGGER_LIBRARY)

cmake/ReadoutCardDependencies.cmake

@@ -17,6 +17,7 @@ find_package(Boost 1.56
   )
 find_package(Git QUIET)
 find_package(Common REQUIRED)
+find_package(InfoLogger REQUIRED)
 
 # Python
 find_package(PythonLibs 2.7)
@@ -52,14 +53,15 @@ o2_define_bucket(
   ${Boost_FILESYSTEM_LIBRARY}
   ${Boost_SYSTEM_LIBRARY}
   ${Boost_PROGRAM_OPTIONS_LIBRARY}
-  InfoLogger
   ${rt_lib}
   pthread
   ${Common_LIBRARIES}
+  ${InfoLogger_LIBRARIES}
 
   SYSTEMINCLUDE_DIRECTORIES
   ${Boost_INCLUDE_DIR}
   ${Common_INCLUDE_DIRS}
+  ${InfoLogger_INCLUDE_DIRS}
 )
 
 o2_define_bucket(
@@ -82,8 +84,8 @@ o2_define_bucket(
   DEPENDENCIES
   ${DIM_LIBRARY}
 
-    SYSTEMINCLUDE_DIRECTORIES
-    ${DIM_INCLUDE_DIRS}
+  SYSTEMINCLUDE_DIRECTORIES
+  ${DIM_INCLUDE_DIRS}
 )
 
 o2_define_bucket(

doc/CMakeLists.txt

@@ -1,17 +1,27 @@
 # @author  Barthélémy von Haller
 
 include(FindDoxygen)
-include(DoxygenTarget)
 
-# Add an option for the user to enable or not the documentation generation every time we compile.
-# Either set it on the command line or use ccmake. It is an advanced option.
-option(BUILD_DOCS "Build doxygen documentation when building all" OFF)
-mark_as_advanced(BUILD_DOCS)
-
-if(NOT DOXYGEN_DOT_FOUND) 
+if(NOT DOXYGEN_DOT_FOUND)
   message(WARNING "Graphviz doesn't seem to be installed. Doxygen will not be able to generate graphs. Consider installing this package.")
-endif(NOT DOXYGEN_DOT_FOUND) 
+endif(NOT DOXYGEN_DOT_FOUND)
+
+if (DOXYGEN_FOUND)
+  # Configure the doxygen config file with current settings
+  set("DOC_OUTPUT_DIR" "${CMAKE_CURRENT_BINARY_DIR}")
+  configure_file(doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/documentation-config.doxygen @ONLY)
+
+  # target doc
+  add_custom_target(doc
+          ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/documentation-config.doxygen
+          WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+          COMMENT "Generating API documentation using doxygen for ${PROJECT_NAME}
+                     \n  Output will be available in ${DOC_OUTPUT_DIR}/html" VERBATIM)
 
-if(DOXYGEN_FOUND)
-  PrepareDocTarget()
-endif(DOXYGEN_FOUND)
+  # installation
+  option(DOC_INSTALL "Install the documentation when calling \"make install\"" OFF)
+  if(DOC_INSTALL)
+    message(STATUS "Documentation will be installed but you *must* run `make doc`")
+    install(DIRECTORY ${DOC_OUTPUT_DIR}/html DESTINATION share/doc/${PROJECT_NAME} COMPONENT doc)
+  endif(DOC_INSTALL)
+endif (DOXYGEN_FOUND)