Modifications to be able to build infologger with alibuild

Author: Barthelemy

.gitignore

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

CMakeLists.txt

@@ -24,7 +24,6 @@ project(InfoLogger)
 # Load some basic macros which are needed later on
 include(O2Utils)
 include(InfoLoggerDependencies)
-include(O2)
 
 # Set the default build type to "RelWithDebInfo"
 if(NOT CMAKE_BUILD_TYPE)
@@ -149,6 +148,7 @@ if(MYSQL_FOUND)
    )
 endif()
 
+enable_testing()
 
 set(TEST_SRCS
   test/testInfoLogger.cxx
@@ -280,16 +280,6 @@ if(BUILD_STANDALONE)
 endif(BUILD_STANDALONE)
 
 
-
-
-# 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 some extra files
 install(
   FILES src/infoBrowser.tcl

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)