[QC-758] Fix the install dir for the Modules (#1114)

Barthelemy · Barthelemy · commit 2044c27bda9d · 2022-03-24T10:50:56.000+01:00
* Fix the install dir for the Modules

* fix

* fix

* fix
diff --git a/Modules/Benchmark/CMakeLists.txt b/Modules/Benchmark/CMakeLists.txt
@@ -28,7 +28,7 @@ add_root_dictionary(O2QcBenchmark
 install(DIRECTORY etc DESTINATION Modules/Benchmark)
 
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/Benchmark
-        DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
+        DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/QualityControl")
 
 # ---- Test(s) ----
 
diff --git a/Modules/CPV/CMakeLists.txt b/Modules/CPV/CMakeLists.txt
@@ -26,7 +26,7 @@ add_root_dictionary(O2QcCPV
                     BASENAME O2QcCPV)
 
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/CPV
-  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
+  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/QualityControl")
 
 # ---- Test(s) ----
 
diff --git a/Modules/CTP/CMakeLists.txt b/Modules/CTP/CMakeLists.txt
@@ -24,7 +24,7 @@ include/CTP/RawDataQcTask.h
                     BASENAME O2QcCTP)
 
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/CTP
-  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
+  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/QualityControl")
 
 # ---- Test(s) ----
 
diff --git a/Modules/Common/CMakeLists.txt b/Modules/Common/CMakeLists.txt
@@ -51,7 +51,7 @@ install(FILES etc/trfcollection-example.json
   DESTINATION Modules/Common)
 
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/Common
-  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
+  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/QualityControl")
 
 # ---- Tests ----
 
diff --git a/Modules/Daq/CMakeLists.txt b/Modules/Daq/CMakeLists.txt
@@ -25,7 +25,7 @@ install(TARGETS O2QcDaq
 
 # Install headers
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/Daq
-  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
+  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/QualityControl")
 
 # ---- Tests ----
 
diff --git a/Modules/EMCAL/CMakeLists.txt b/Modules/EMCAL/CMakeLists.txt
@@ -34,7 +34,7 @@ install (
 )
 
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/EMCAL
-  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
+  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/QualityControl")
 
 # ---- Executables ----
 
diff --git a/Modules/Example/CMakeLists.txt b/Modules/Example/CMakeLists.txt
@@ -35,7 +35,7 @@ install(TARGETS O2QcExample
         RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/Example
-  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
+  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/QualityControl")
 
 # ---- Workflows for analysis ----
 
diff --git a/Modules/FDD/CMakeLists.txt b/Modules/FDD/CMakeLists.txt
@@ -25,7 +25,7 @@ add_root_dictionary(O2QcFDD
                     BASENAME O2QcFDD)
 
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/FDD
-  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
+  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/QualityControl")
 
 # ---- Test(s) ----
 
diff --git a/Modules/FT0/CMakeLists.txt b/Modules/FT0/CMakeLists.txt
@@ -52,7 +52,7 @@ add_root_dictionary(O2QcFT0
         BASENAME O2QcFT0)
 
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/FT0
-  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
+  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/QualityControl")
 
 # ---- Executables ----
 # keep commented as an example
diff --git a/Modules/FV0/CMakeLists.txt b/Modules/FV0/CMakeLists.txt
@@ -41,7 +41,7 @@ add_root_dictionary(O2QcFV0
                     BASENAME O2QcFV0)
 
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/FV0
-  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
+  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/QualityControl")
 
 # ---- Test(s) ----
 
diff --git a/Modules/GLO/CMakeLists.txt b/Modules/GLO/CMakeLists.txt
@@ -42,7 +42,7 @@ add_root_dictionary(O2QcGLO
                     BASENAME O2QcGLO)
 
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/GLO
-  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
+  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/QualityControl")
 
 # ---- Test(s) ----
 
diff --git a/Modules/HMPID/CMakeLists.txt b/Modules/HMPID/CMakeLists.txt
@@ -35,7 +35,7 @@ add_root_dictionary(O2QcHMPID
                     BASENAME O2QcHMPID)
 
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/HMPID
-  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
+  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/QualityControl")
 
 # ---- Test(s) ----
 
diff --git a/Modules/ITS/CMakeLists.txt b/Modules/ITS/CMakeLists.txt
@@ -45,7 +45,7 @@ install(TARGETS O2QcITS
         RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ITS
-  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
+  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/QualityControl")
 
 # ---- ROOT dictionary  ----
 
diff --git a/Modules/MFT/CMakeLists.txt b/Modules/MFT/CMakeLists.txt
@@ -42,7 +42,7 @@ add_root_dictionary(O2QcMFT
                     BASENAME O2QcMFT)
 
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/MFT
-  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
+  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/QualityControl")
                     
 # ---- Executables ----
 
diff --git a/Modules/MUON/MCH/CMakeLists.txt b/Modules/MUON/MCH/CMakeLists.txt
@@ -70,7 +70,7 @@ install(
 )
 
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/MCH
-  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
+  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/QualityControl")
 
 # ---- ROOT dictionary ----
 
diff --git a/Modules/MUON/MID/CMakeLists.txt b/Modules/MUON/MID/CMakeLists.txt
@@ -26,7 +26,7 @@ add_root_dictionary(
   BASENAME O2QcMID)
 
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/MID
-  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
+  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/QualityControl")
 
 # ---- Test(s) ----
 
diff --git a/Modules/PHOS/CMakeLists.txt b/Modules/PHOS/CMakeLists.txt
@@ -35,7 +35,7 @@ install (
 )
 
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/PHOS
-	DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
+	DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/QualityControl")
 
 # ---- Executables ----
 
diff --git a/Modules/Skeleton/.CMakeListsEmpty.txt b/Modules/Skeleton/.CMakeListsEmpty.txt
@@ -23,7 +23,7 @@ add_root_dictionary(O2QcSkeleton
                     BASENAME O2QcSkeleton)
 
 # Install headers
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/Skeleton
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/QualityControl/Skeleton
         DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
 
 # ---- Test(s) ----
diff --git a/Modules/Skeleton/CMakeLists.txt b/Modules/Skeleton/CMakeLists.txt
@@ -19,7 +19,7 @@ install(TARGETS O2QcSkeleton
 
 # Install headers
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/Skeleton
-  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
+  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/QualityControl")
 
 # ---- ROOT dictionary ----
 
diff --git a/Modules/TOF/CMakeLists.txt b/Modules/TOF/CMakeLists.txt
@@ -46,7 +46,7 @@ install(TARGETS O2QcTOF
         RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/TOF
-  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
+  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/QualityControl")
 
 # ---- ROOT dictionary ----
 
diff --git a/Modules/TPC/CMakeLists.txt b/Modules/TPC/CMakeLists.txt
@@ -63,7 +63,7 @@ add_root_dictionary(O2QcTPC
                     BASENAME O2QcTPC)
 
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/TPC
-  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
+  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/QualityControl")
 
 # ---- Test(s) ----
 
diff --git a/Modules/TRD/CMakeLists.txt b/Modules/TRD/CMakeLists.txt
@@ -59,7 +59,7 @@ install(TARGETS O2QcTRD ${EXE_NAMES}
         RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/TRD
-  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
+  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/QualityControl")
 
 # ---- Install config files ----
 
diff --git a/Modules/ZDC/CMakeLists.txt b/Modules/ZDC/CMakeLists.txt
@@ -25,7 +25,7 @@ add_root_dictionary(O2QcZDC
                     BASENAME O2QcZDC)
 
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ZDC
-  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
+  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/QualityControl")
 
 # ---- Test(s) ----
 

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ install (`
`34`	`34`	`)`
`35`	`35`
`36`	`36`	`install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/EMCAL`
`37`		`- DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")`
	`37`	`+ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/QualityControl")`
`38`	`38`
`39`	`39`	`# ---- Executables ----`
`40`	`40`