Update modulesHelper to latest cmake changes (QC-94) (#63)

Author: Barthelemy

Modules/SkeletonDPL/.CMakeListsEmpty.txt

@@ -1,28 +1,48 @@
-set(MODULE_NAME "SkeletonDPL")
+set(MODULE_NAME "QcSkeletonDPL")
 
-O2_SETUP(NAME ${MODULE_NAME})
+# ---- Files ----
 
 set(SRCS
 )
 
-include_directories(
-  ${CMAKE_CURRENT_BINARY_DIR}/include
-)
-
 set(HEADERS
 )
 
-set(LIBRARY_NAME ${MODULE_NAME})
-set(BUCKET_NAME o2_qcmodules_dpl)
-set(LINKDEF include/SkeletonDPL/LinkDef.h)
+# ---- Library ----
+
+add_library(${MODULE_NAME} SHARED ${SRCS} ${MODULE_NAME}Dict.cxx)
+
+target_include_directories(
+  ${MODULE_NAME}
+  PUBLIC $<INSTALL_INTERFACE:include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
+)
 
-O2_GENERATE_LIBRARY()
+target_link_libraries(${MODULE_NAME} PUBLIC QualityControl)
 
-set(TEST_SRCS
+install(
+        TARGETS ${MODULE_NAME}
+        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
 )
 
-O2_GENERATE_TESTS(
-  MODULE_LIBRARY_NAME ${LIBRARY_NAME}
-  BUCKET_NAME ${BUCKET_NAME}
-  TEST_SRCS ${TEST_SRCS}
+# ---- ROOT dictionary ----
+
+generate_root_dict(MODULE_NAME ${MODULE_NAME} LINKDEF "include/SkeletonDPL/LinkDef.h" DICT_CLASS "${MODULE_NAME}Dict")
+
+# ---- Tests ----
+
+set(
+  TEST_SRCS
 )
+
+foreach(test ${TEST_SRCS})
+  get_filename_component(test_name ${test} NAME)
+  string(REGEX REPLACE ".cxx" "" test_name ${test_name})
+
+  add_executable(${test_name} ${test})
+  target_link_libraries(${test_name} PRIVATE ${MODULE_NAME} Boost::unit_test_framework)
+  add_test(NAME ${test_name} COMMAND ${test_name})
+  set_tests_properties(${test_name} PROPERTIES TIMEOUT 60)
+endforeach()

Modules/SkeletonDPL/CMakeLists.txt

@@ -1,4 +1,4 @@
-set(MODULE_NAME "QcSkeletonDpl")
+set(MODULE_NAME "QcSkeletonDPL")
 
 # ---- Files ----
 

Modules/modulesHelper.sh

@@ -36,14 +36,14 @@ function create_module {
     MODULE_LC=`echo $1 | tr A-Z a-z`
     # prepare folder structure
     mkdir $1 $1/src $1/include/ $1/include/$1 $1/test
-    
+
     # prepare CMakeLists.txt
     sed 's/'${DONOR}'/'$1'/' ${DONOR}/.CMakeListsEmpty.txt > $1/CMakeLists.txt
     # prepare LinkDef.h
     sed '/#pragma link C++ class o2::quality_control_modules::'${DONOR_LC}'::/ d' ${DONOR}/include/${DONOR}/LinkDef.h > $1/include/$1/LinkDef.h
     # prepare test
     sed 's/.testEmpty/test'$1'/; s/'${DONOR_LC}'/'${MODULE_LC}'/' ${DONOR}/test/.testEmpty.cxx > $1'/test/test'$1'.cxx'
-    
+
     if [[ $OS == Linux ]] ; then
       sed -i '/set(TEST_SRCS/ a \ \ test/test'$1'.cxx' $1/CMakeLists.txt
     else #Darwin/BSD
@@ -54,7 +54,7 @@ function create_module {
 
     # add new module to the project
     echo 'add_subdirectory('$1')' >> CMakeLists.txt
-    
+
     echo '> Module created.'
   fi
 }
@@ -68,12 +68,12 @@ function create_task {
     echo '> Task '$2' already exists, returning...'
     return
   fi
-  
+
   MODULE_LC=`echo $1 | tr A-Z a-z`
   INCLUDE_GUARD_NAME=QC_MODULE_`echo $1 | tr a-z A-Z`_`echo $2 | tr a-z A-Z`_H
-  
+
   # add header
-  sed 's/'${DONOR_TASK}'/'$2'/g; s/'${DONOR_LC}'/'${MODULE_LC}'/g; s/'${DONOR}'/'${MODULE}'/g; s/'${DONOR_TASK_INCLUDE_GUARD}'/'${INCLUDE_GUARD_NAME}'/g' ${DONOR}'/include/'${DONOR}'/'${DONOR_TASK}'.h' > $1'/include/'$1'/'$2'.h' 
+  sed 's/'${DONOR_TASK}'/'$2'/g; s/'${DONOR_LC}'/'${MODULE_LC}'/g; s/'${DONOR}'/'${MODULE}'/g; s/'${DONOR_TASK_INCLUDE_GUARD}'/'${INCLUDE_GUARD_NAME}'/g' ${DONOR}'/include/'${DONOR}'/'${DONOR_TASK}'.h' > $1'/include/'$1'/'$2'.h'
   if [[ $OS == Linux ]] ; then
     sed -i '/#endif/ i #pragma link C++ class o2::quality_control_modules::'${MODULE_LC}'::'$2'+;' $1/include/$1/LinkDef.h
     sed -i '/set(HEADERS/ a \ \ include/'$1'/'$2'.h' $1/CMakeLists.txt
@@ -90,6 +90,9 @@ function create_task {
   sed 's/'${DONOR_TASK}'/'$2'/g; s/'${DONOR_LC}'/'${MODULE_LC}'/g; s/'${DONOR}'/'${MODULE}'/g' ${DONOR}'/src/'${DONOR_TASK}'.cxx' > $1'/src/'$2'.cxx'
   if [[ $OS == Linux ]] ; then
     sed -i '/set(SRCS/ a \ \ src/'$2'.cxx' $1/CMakeLists.txt
+    # Remove the Check
+    sed -i 's|getObjectsManager()->addCheck|/*getObjectsManager()->addCheck|' $1/src/$2.cxx
+    sed -i 's|"QcSkeletonDpl");|"QcSkeletonDpl");*/|' $1/src/$2.cxx
   else #Darwin/BSD
     sed -i '' -e '/set(SRCS/ a\
 \ \ src/'$2'.cxx
@@ -103,17 +106,17 @@ function create_task {
 # \param 2 : check_name
 function create_check {
   echo 'Creating check '$2' in module '$1'.'
-  
+
   if [ -f $1'/include/'$1'/'$2'.h' ] ; then
     echo '> Check '$2' already exists, returning...'
     return
   fi
-  
+
   MODULE_LC=`echo $1 | tr A-Z a-z`
   INCLUDE_GUARD_NAME=QC_MODULE_`echo $1 | tr a-z A-Z`_`echo $2 | tr a-z A-Z`_H
-  
+
   # add header
-  sed 's/'${DONOR_CHECK}'/'$2'/g; s/'${DONOR_LC}'/'${MODULE_LC}'/g; s/'${DONOR}'/'${MODULE}'/g; s/'${DONOR_CHECK_INCLUDE_GUARD}'/'${INCLUDE_GUARD_NAME}'/g' ${DONOR}'/include/'${DONOR}'/'${DONOR_CHECK}'.h' > $1'/include/'$1'/'$2'.h' 
+  sed 's/'${DONOR_CHECK}'/'$2'/g; s/'${DONOR_LC}'/'${MODULE_LC}'/g; s/'${DONOR}'/'${MODULE}'/g; s/'${DONOR_CHECK_INCLUDE_GUARD}'/'${INCLUDE_GUARD_NAME}'/g' ${DONOR}'/include/'${DONOR}'/'${DONOR_CHECK}'.h' > $1'/include/'$1'/'$2'.h'
   if [[ $OS == Linux ]] ; then
     sed -i '/#endif/ i #pragma link C++ class o2::quality_control_modules::'${MODULE_LC}'::'$2'+;' $1/include/$1/LinkDef.h
     sed -i '/set(HEADERS/ a \ \ include/'$1'/'$2'.h' $1/CMakeLists.txt
@@ -127,7 +130,7 @@ function create_check {
   fi
 
   # add src
-  sed 's/'${DONOR_CHECK}'/'$2'/g; s/'${DONOR_LC}'/'${MODULE_LC}'/g; s/'${DONOR}'/'${MODULE}'/g' ${DONOR}'/src/'${DONOR_CHECK}'.cxx' > $1'/src/'$2'.cxx' 
+  sed 's/'${DONOR_CHECK}'/'$2'/g; s/'${DONOR_LC}'/'${MODULE_LC}'/g; s/'${DONOR}'/'${MODULE}'/g' ${DONOR}'/src/'${DONOR_CHECK}'.cxx' > $1'/src/'$2'.cxx'
   if [[ $OS == Linux ]] ; then
     sed -i '/set(SRCS/ a \ \ src/'$2'.cxx' $1/CMakeLists.txt
   else #Darwin/BSD
@@ -144,7 +147,7 @@ function print_usage {
 
 Generate template QC module and/or tasks, checks.
 If a module with specified name already exists, new tasks and checks are inserted to the existing one.
-Please follow UpperCamelCase convention for modules', tasks' and checks' names. 
+Please follow UpperCamelCase convention for modules', tasks' and checks' names.
 
 Example:
 # create new module and some task