From 42edd5cbbe7462edf93b23e728b5992f025e4304 Mon Sep 17 00:00:00 2001
From: Florian Uhlig <f.uhlig@gsi.de>
Date: Fri, 30 Apr 2021 11:55:57 +0200
Subject: [PATCH] Install macros which are in the test suite
---
macro/C2F/CMakeLists.txt | 8 ++------
macro/CMakeLists.txt | 15 +++++++++++++++
macro/KF/CMakeLists.txt | 9 ++-------
macro/dimuon/CMakeLists.txt | 6 ++----
macro/mcbm/CMakeLists.txt | 3 ++-
macro/much/CMakeLists.txt | 17 +++++++----------
macro/mvd/qa/CMakeLists.txt | 4 ++++
macro/run/CMakeLists.txt | 8 ++------
8 files changed, 36 insertions(+), 34 deletions(-)
diff --git a/macro/C2F/CMakeLists.txt b/macro/C2F/CMakeLists.txt
index 0fa85f4e7a..0f60dbcd39 100644
--- a/macro/C2F/CMakeLists.txt
+++ b/macro/C2F/CMakeLists.txt
@@ -92,9 +92,5 @@ EndIf()
EndForEach(setup IN LISTS cbm_setup)
# end of test CBM setups from geometry/setup
-Install(FILES .rootrc c2f_transport.C
- DESTINATION share/cbmroot/macro/c2f
- )
-Install(CODE "FILE(MAKE_DIRECTORY \${CMAKE_INSTALL_PREFIX}/share/cbmroot/macro/run/data)")
-
-
+# Installation of macros is done in macro/CMakeLists.txt to install the
+# macros even if the tests are not executed
diff --git a/macro/CMakeLists.txt b/macro/CMakeLists.txt
index 3698a4e48b..2fd4215eda 100644
--- a/macro/CMakeLists.txt
+++ b/macro/CMakeLists.txt
@@ -29,6 +29,7 @@ EndIf()
GENERATE_TEST_SCRIPT(${CBMROOT_SOURCE_DIR}/scripts/checklibs.sh ${CBMROOT_BINARY_DIR}/macro/)
add_test(load_libraries ${CBMROOT_BINARY_DIR}/macro/checklibs.sh)
+
# Install in any case
Install(FILES KF/DecayConfig.C KF/registerGeantDecays.C KF/registerLightIons.C KF/registerPythiaDecays.C
KF/kf_kfparticle.C KF/kf_thermal_signal_generator.C KF/kf_transport.C
@@ -36,6 +37,20 @@ Install(FILES KF/DecayConfig.C KF/registerGeantDecays.C KF/registerLightIons.C K
)
Install(CODE "FILE(MAKE_DIRECTORY ${CMAKE_INSTALL_PREFIX}/share/cbmroot/macro/KF/data)")
+Install(FILES C2F/.rootrc C2F/c2f_transport.C C2F/sis100_electron.tree.list
+ ${CBMROOT_SOURCE_DIR}/macro/analysis/common/analysis_tree_converter/run_analysis_tree_maker.C
+ ${CBMROOT_SOURCE_DIR}/macro/analysis/common/at_kfpf_interface/run_at_kfpf.C
+ ${CBMROOT_SOURCE_DIR}/macro/analysis/common/qa/run_analysistree_qa.C
+ DESTINATION share/cbmroot/macro/c2f
+ )
+Install(CODE "FILE(MAKE_DIRECTORY ${CMAKE_INSTALL_PREFIX}/share/cbmroot/macro/c2f/data)")
+
+Install(FILES dimuon/.rootrc dimuon/dimuon_transport.C dimuon/invM.C
+ ${CBMROOT_SOURCE_DIR}/macro/much/run_ana.C
+ DESTINATION share/cbmroot/macro/dimuon
+ )
+Install(CODE "FILE(MAKE_DIRECTORY ${CMAKE_INSTALL_PREFIX}/share/cbmroot/macro/dimuon/data)")
+
#--- Deprecated (not running)
#add_subdirectory(trd)
#add_subdirectory(littrack)
diff --git a/macro/KF/CMakeLists.txt b/macro/KF/CMakeLists.txt
index e802033fca..3a3e2a4217 100644
--- a/macro/KF/CMakeLists.txt
+++ b/macro/KF/CMakeLists.txt
@@ -153,10 +153,5 @@ ForEach(iSignal RANGE 16)
EndForEach(iSignal)
-
-#Install(FILES .rootrc
-# DecayConfig.C registerGeantDecays.C registerLightIons.C registerPythiaDecays.C
-# kf_kfparticle.C kf_thermal_signal_generator.C kf_transport.C
-# DESTINATION share/cbmroot/macro/KF
-# )
-#Install(CODE "FILE(MAKE_DIRECTORY \${CMAKE_INSTALL_PREFIX}/share/cbmroot/macro/KF/data)")
+# Installation of macros is done in macro/CMakeLists.txt to install the
+# macros even if the tests are not executed
diff --git a/macro/dimuon/CMakeLists.txt b/macro/dimuon/CMakeLists.txt
index d22c848cad..5b4763debd 100644
--- a/macro/dimuon/CMakeLists.txt
+++ b/macro/dimuon/CMakeLists.txt
@@ -72,7 +72,5 @@ If( ($ENV{ctest_model} MATCHES Nightly) OR ($ENV{ctest_model} MATCHES Weekly) )
# end of test CBM setups from geometry/setup
EndIf()
-Install(FILES .rootrc dimuon_transport.C
- DESTINATION share/cbmroot/macro/dimuon
- )
-Install(CODE "FILE(MAKE_DIRECTORY \${CMAKE_INSTALL_PREFIX}/share/cbmroot/macro/run/data)")
+# Installation of macros is done in macro/CMakeLists.txt to install the
+# macros even if the tests are not executed
diff --git a/macro/mcbm/CMakeLists.txt b/macro/mcbm/CMakeLists.txt
index 38ce5aa6d3..691260182b 100644
--- a/macro/mcbm/CMakeLists.txt
+++ b/macro/mcbm/CMakeLists.txt
@@ -152,7 +152,8 @@ EndForEach(setup IN LISTS cbm_setup)
# end of test CBM configs from geometry/config
# disable dev tests - Install(FILES .rootrc mcbm_transport.C mcbm_reco.C mcbm_check_overlaps.C
-Install(FILES .rootrc mcbm_transport.C mcbm_reco.C mcbm_check_overlaps.C
+Install(FILES .rootrc mcbm_transport.C mcbm_digi.C mcbm_reco_event.C mcbm_check_overlaps.C
+ mcbm_match_check.C mcbm_hadron_analysis.C mcbm_qa.C
DESTINATION share/cbmroot/macro/mcbm
)
Install(DIRECTORY modules DESTINATION share/cbmroot/macro/mcbm)
diff --git a/macro/much/CMakeLists.txt b/macro/much/CMakeLists.txt
index ec6ed21e96..1c8232fd93 100644
--- a/macro/much/CMakeLists.txt
+++ b/macro/much/CMakeLists.txt
@@ -42,13 +42,10 @@ SET_TESTS_PROPERTIES(${testname} PROPERTIES PASS_REGULAR_EXPRESSION "TestPassed;
set_tests_properties(${testname} PROPERTIES FIXTURES_REQUIRED fixture_much_ana)
-#Install(FILES .rootrc setup_much_test.C
-# DESTINATION share/cbmroot/macro/much
-# )
-#Install(FILES data/jpsi.root
-# data/much_digi_sector_4station.seg
-# DESTINATION share/cbmroot/macro/much/data
-# )
-
-#Install(CODE "FILE(MAKE_DIRECTORY
-#${CMAKE_INSTALL_PREFIX}/share/cbmroot/macro/much/data)")
+Install(FILES .rootrc run_transport.C run_ana.C
+ DESTINATION share/cbmroot/macro/much
+ )
+
+Install(DIRECTORY data
+ DESTINATION share/cbmroot/macro/much
+ )
diff --git a/macro/mvd/qa/CMakeLists.txt b/macro/mvd/qa/CMakeLists.txt
index c1de157693..2a3465ca33 100644
--- a/macro/mvd/qa/CMakeLists.txt
+++ b/macro/mvd/qa/CMakeLists.txt
@@ -28,3 +28,7 @@ SET_TESTS_PROPERTIES(mvd_qa4_reco PROPERTIES TIMEOUT "300")
SET_TESTS_PROPERTIES(mvd_qa4_reco PROPERTIES PASS_REGULAR_EXPRESSION "Test Passed;All ok")
set_tests_properties(mvd_qa4_reco PROPERTIES FIXTURES_REQUIRED fixture_mvd_qa4_reco)
+Install(FILES mvd_qa1_transUrqmd.C mvd_qa2_transDelta.C mvd_qa3_digitize.C mvd_qa4_reco.C
+ DESTINATION share/cbmroot/macro/mvd
+ )
+Install(CODE "FILE(MAKE_DIRECTORY ${CMAKE_INSTALL_PREFIX}/share/cbmroot/macro/mvd/data)")
diff --git a/macro/run/CMakeLists.txt b/macro/run/CMakeLists.txt
index dec6534b48..0c2447a1fc 100644
--- a/macro/run/CMakeLists.txt
+++ b/macro/run/CMakeLists.txt
@@ -235,12 +235,8 @@ foreach(setup IN LISTS cbm_setup)
endforeach(setup IN LISTS cbm_setup)
# ============================================================================
-
-
-
-
-Install(FILES .rootrc run_transport.C run_transport_json_config.C run_digi_json_config.C config.json run_digi.C run_reco_event.C check_overlaps.C
+Install(FILES .rootrc run_tra_file.C run_tra_beam.C run_transport_json_config.C run_digi_json_config.C config.json
+ run_digi.C run_reco.C run_tests.sh
DESTINATION share/cbmroot/macro/run
)
-Install(DIRECTORY modules DESTINATION share/cbmroot/macro/run)
Install(CODE "FILE(MAKE_DIRECTORY \${CMAKE_INSTALL_PREFIX}/share/cbmroot/macro/run/data)")
--
GitLab