.gitlab-ci.yml

@@ -176,6 +176,9 @@ FileLicenceCheck:
     - if [[ -n $EXTRA_FLAGS ]]; then
     -   echo "export EXTRA_FLAGS=$EXTRA_FLAGS" >> Dart.cfg
     - fi
+    - if [[ -n $INSTALL_PROJECT ]]; then
+    -   echo "export INSTALL_PROJECT=TRUE" >> Dart.cfg
+    - fi
     - if [[ -n $CONFIGFILE ]]; then
     -   source $CONFIGFILE $FAIRSOFT_VERSION
     - fi
@@ -215,6 +218,8 @@ FileLicenceCheck:
     SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION"
     FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_fs_${FAIRSOFT_VERSION}"
     CONFIGFILE: "/cvmfs/cbm.gsi.de/$OS/bin/setup_development_environment.sh"
+    INSTALL_PROJECT: "TRUE"
+    EXTRA_FLAGS: '"-DCBM_TEST_INSTALL=TRUE"'
 
 .singularity_centos7_variables_apr21: &singularity_centos7_variables_apr21
     OS: centos7
@@ -233,7 +238,8 @@ FileLicenceCheck:
     BASE_PATH: "/opt/"
     SIMPATH: "$BASE_PATH/fairsoft/${FAIRSOFT_VERSION}"
     FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_${FAIRSOFT_VERSION}"
-    EXTRA_FLAGS: '"-DCBM_TEST_INSTALL=TRUE\" \"-DCMAKE_INSTALL_PREFIX=install"'
+    INSTALL_PROJECT: "TRUE"
+    EXTRA_FLAGS: '"-DCBM_TEST_INSTALL=TRUE"'
 
 .linux_tag: &linux_tag
   stage: build

CbmRoot_test.cmake

@@ -11,6 +11,7 @@ Set(CTEST_BUILD_NAME $ENV{LABEL})
 Set(CTEST_CMAKE_GENERATOR "Unix Makefiles")
 Set(CTEST_PROJECT_NAME "CBMROOT")
 Set(EXTRA_FLAGS $ENV{EXTRA_FLAGS})
+Set(INSTALL_PROJECT $ENV{INSTALL_PROJECT})
 
 if(NOT CBM_TEST_MODEL)
   set(CBM_TEST_MODEL NIGHTLY)
@@ -45,7 +46,9 @@ Else()
   set(_CMakeModel ${CBM_TEST_MODEL})
 EndIf()
 
-If(EXTRA_FLAGS)
+If(EXTRA_FLAGS AND INSTALL_PROJECT)
+  Set(CTEST_CONFIGURE_COMMAND " \"${CMAKE_EXECUTABLE_NAME}\" \"-G${CTEST_CMAKE_GENERATOR}\" \"-DCBM_TEST_MODEL=${CBM_TEST_MODEL}\" \"-DCMAKE_BUILD_TYPE=${_BuildType}\" \"-DCTEST_USE_LAUNCHERS=${CTEST_USE_LAUNCHERS}\" \"${EXTRA_FLAGS}\" \"-DCMAKE_INSTALL_PREFIX=${CTEST_SOURCE_DIRECTORY}/install\" \"${CTEST_SOURCE_DIRECTORY}\" ")
+ElseIf(EXTRA_FLAGS)
   Set(CTEST_CONFIGURE_COMMAND " \"${CMAKE_EXECUTABLE_NAME}\" \"-G${CTEST_CMAKE_GENERATOR}\" \"-DCBM_TEST_MODEL=${CBM_TEST_MODEL}\" \"-DCMAKE_BUILD_TYPE=${_BuildType}\" \"-DCTEST_USE_LAUNCHERS=${CTEST_USE_LAUNCHERS}\" \"${EXTRA_FLAGS}\" \"${CTEST_SOURCE_DIRECTORY}\" ")
 Else()
   Set(CTEST_CONFIGURE_COMMAND " \"${CMAKE_EXECUTABLE_NAME}\" \"-G${CTEST_CMAKE_GENERATOR}\" \"-DCBM_TEST_MODEL=${CBM_TEST_MODEL}\" \"-DCMAKE_BUILD_TYPE=${_BuildType}\" \"-DCTEST_USE_LAUNCHERS=${CTEST_USE_LAUNCHERS}\" \"${CTEST_SOURCE_DIRECTORY}\" ")
@@ -133,17 +136,18 @@ If(NOT _RETVAL)
     Ctest_Submit(BUILD_ID cdash_build_id)
   EndIf()
 
-  If(EXTRA_FLAGS MATCHES "INSTALL_PREFIX" AND EXTRA_FLAGS MATCHES "CBM_TEST_INSTALL" AND NOT _ctest_test_ret_val)
+  If(EXTRA_FLAGS MATCHES "CBM_TEST_INSTALL" AND NOT _ctest_test_ret_val)
+#  If(EXTRA_FLAGS MATCHES "INSTALL_PREFIX" AND EXTRA_FLAGS MATCHES "CBM_TEST_INSTALL" AND NOT _ctest_test_ret_val)
     Message("Testing Installation")
     execute_process(COMMAND ${BUILD_COMMAND} install -j$ENV{number_of_processors} WORKING_DIRECTORY ${CTEST_BINARY_DIRECTORY}
                     RESULTS_VARIABLE _install_ret_value
                    )
     if (NOT _install_ret_value)
-      execute_process(COMMAND ${CMAKE_EXECUTABLE_NAME} -E rm -R MQ algo analysis core external fles mvd reco sim
+      execute_process(COMMAND ${CMAKE_EXECUTABLE_NAME} -E rm -R build MQ algo analysis core external fles mvd reco sim
                       WORKING_DIRECTORY ${CTEST_SOURCE_DIRECTORY}
                      )
       message("executing test suite in ${CTEST_BINARY_DIRECTORY}/install")
-      execute_process(COMMAND ${CTEST_SOURCE_DIRECTORY}/cmake/scripts/execute_installation_test.sh ${CTEST_BINARY_DIRECTORY}/install
+      execute_process(COMMAND ${CTEST_SOURCE_DIRECTORY}/cmake/scripts/execute_installation_test.sh ${CTEST_SOURCE_DIRECTORY}/install
                       RESULTS_VARIABLE _install_ret_value
                      )
     endif()

cmake/scripts/config.csh.in

@@ -30,7 +30,6 @@ if ( "$same_system" == "1" ) then
 	setenv VMCWORKDIR "@VMCWORKDIR@"
 	setenv FAIRLIBDIR "@FAIRLIBDIR@"
 	setenv PYTHONPATH "@MY_PYTHONPATH@"
-	setenv OMP_NUM_THREADS @OMP_NUM_THREADS@
 	if (! $?OMP_NUM_THREADS) then
 		setenv OMP_NUM_THREADS @OMP_NUM_THREADS@
 	else

cmake/scripts/config.sh.in

@@ -29,7 +29,7 @@ if [ $same_system -eq 1 ]; then
 	export VMCWORKDIR="@VMCWORKDIR@"
 	export FAIRLIBDIR="@FAIRLIBDIR@"
 	export PYTHONPATH="@MY_PYTHONPATH@"
-	if [[ -z "${OMP_NUM_THREADS}" ]]; then
+	if [[ -z $OMP_NUM_THREADS ]]; then
 		export OMP_NUM_THREADS=@OMP_NUM_THREADS@
 	fi
 

cmake/scripts/root_macro.sh.in

@@ -19,7 +19,7 @@ export VMCWORKDIR=@VMCWORKDIR@
 export Geant4VMC_MACRO_DIR=@Geant4VMC_MACRO_DIR@
 export USE_VGM=1
 export BOOST=@Boost_Avail@
-if [[ -z "${OMP_NUM_THREADS}" ]]; then
+if [[ -z $OMP_NUM_THREADS ]]; then
   export OMP_NUM_THREADS=@OMP_NUM_THREADS@
 fi
 

external/flib_dpb/CMakeLists.txt

@@ -10,4 +10,6 @@ set(LIB_HEADERS flib_dpb/MicrosliceContents.hpp)
 
 add_Library(flib_dpb SHARED ${LIB_SOURCES} ${LIB_HEADERS})
 target_include_directories(flib_dpb PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/flib_dpb)
-Set_Target_Properties(flib_dpb PROPERTIES  SUFFIX ".so")
+
+install(TARGETS flib_dpb DESTINATION lib)
+install(FILES ${LIB_HEADERS} DESTINATION include)

reco/base/CMakeLists.txt

@@ -48,7 +48,6 @@ set(PRIVATE_DEPENDENCIES
   )
 
 set(INTERFACE_DEPENDENCIES
-  CbmFlibMcbm2018
   external::fles_ipc
   ROOT::Hist
   )