Missing macros

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a80d201eb211f78376c075d6f4cd0c8add95f9c0..ea522245a931309e400b0166f31d80c5de74829b 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,6 +21,15 @@ cmake_minimum_required(VERSION 2.8.11 FATAL_ERROR)
 
 project(AliRoot CXX C)
 
+message(STATUS "CMake platform: ${CMAKE_SYSTEM}")
+message(STATUS "Build folder: ${AliRoot_BINARY_DIR}")
+message(STATUS "Source folder: ${AliRoot_SOURCE_DIR}")
+message(STATUS "Installation folder: ${CMAKE_INSTALL_PREFIX}")
+
+if(CMAKE_INSTALL_PREFIX STREQUAL "${AliRoot_SOURCE_DIR}")
+    message(FATAL_ERROR "Please choose a different installation point than the source tree!")
+endif()
+
 # Path to additonal modules
 set(CMAKE_MODULE_PATH "${AliRoot_SOURCE_DIR}/cmake")
 
@@ -171,11 +180,6 @@ find_package(FASTJET)
 # ZEROMQ
 find_package(ZeroMQ)
 
-message(STATUS "CMake platform: ${CMAKE_SYSTEM}")
-message(STATUS "Build folder: ${AliRoot_BINARY_DIR}")
-message(STATUS "Source folder: ${AliRoot_SOURCE_DIR}")
-message(STATUS "Installation folder: ${CMAKE_INSTALL_PREFIX}")
-
 # General flags -> Should be moved into a configuration file
 set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
 set(CMAKE_NO_SYSTEM_FROM_IMPORTED TRUE)

diff --git a/PWGCF/FEMTOSCOPY/CMakeLists.txt b/PWGCF/FEMTOSCOPY/CMakeLists.txt
index b86610eb81c8ba6153729d28e23092aa61f8650c..aa4bda601035083c587aa578166260f0bfdc212e 100644 (file)
--- a/PWGCF/FEMTOSCOPY/CMakeLists.txt
+++ b/PWGCF/FEMTOSCOPY/CMakeLists.txt
@@ -21,6 +21,7 @@ add_subdirectory(ESE)
 add_subdirectory(K0Analysis)
 add_subdirectory(UNICOR)
 
-install (DIRECTORY macros
-         DESTINATION PWGCF/FEMTOSCOPY
-         PATTERN .svn EXCLUDE)
+install(DIRECTORY
+                macros
+        DESTINATION 
+                PWGCF/FEMTOSCOPY)

diff --git a/PWGGA/CaloTrackCorrelations/CMakeLists.txt b/PWGGA/CaloTrackCorrelations/CMakeLists.txt
index 378f3c4879ca5f9468e3b74e557a499573fd2a28..6859fbb72b2efd7b10a423f6e3aadb558fb8e162 100644 (file)
--- a/PWGGA/CaloTrackCorrelations/CMakeLists.txt
+++ b/PWGGA/CaloTrackCorrelations/CMakeLists.txt
@@ -108,4 +108,9 @@ install(TARGETS ${MODULE}
         ARCHIVE DESTINATION lib
         LIBRARY DESTINATION lib)
 
-install(FILES ${HDRS} DESTINATION include)
\ No newline at end of file
+install(FILES ${HDRS} DESTINATION include)
+
+install(FILES macros/QA/AddTaskCalorimeterQA.C 
+              macros/QA/AddTaskPi0IMGammaCorrQA.C
+        DESTINATION PWGGA/CaloTrackCorrelations/macros/QA/
+       )
\ No newline at end of file

diff --git a/PWGGA/EMCALTasks/CMakeLists.txt b/PWGGA/EMCALTasks/CMakeLists.txt
index db2d51d17ec62bbb5cdf60d074602a68c6168c26..95ca50c525e5d70778ae41b5b76b20892710d793 100644 (file)
--- a/PWGGA/EMCALTasks/CMakeLists.txt
+++ b/PWGGA/EMCALTasks/CMakeLists.txt
@@ -114,4 +114,7 @@ install(TARGETS ${MODULE}
         ARCHIVE DESTINATION lib
         LIBRARY DESTINATION lib)
 
-install(FILES ${HDRS} DESTINATION include)
\ No newline at end of file
+install(FILES ${HDRS} DESTINATION include)
+
+install (FILES macros/AddTaskEMCALTriggerQA.C
+         DESTINATION PWGGA/EMCALTasks/macros/ )
\ No newline at end of file

diff --git a/PWGGA/PHOSTasks/CMakeLists.txt b/PWGGA/PHOSTasks/CMakeLists.txt
index 644469701e25eb502c5aa67612c2a06e9525acdc..ffbfc3b7611587fd99c7c46198141e6c56b6844e 100644 (file)
--- a/PWGGA/PHOSTasks/CMakeLists.txt
+++ b/PWGGA/PHOSTasks/CMakeLists.txt
@@ -133,4 +133,22 @@ install(TARGETS ${MODULE}
         ARCHIVE DESTINATION lib
         LIBRARY DESTINATION lib)
 
-install(FILES ${HDRS} DESTINATION include)
\ No newline at end of file
+install(FILES ${HDRS} DESTINATION include)
+
+install(FILES
+                CaloCellQA/macros/AddTaskCaloCellsQA.C
+                CaloCellQA/macros/AddTaskPHOSQA.C
+       DESTINATION
+                PWGGA/PHOSTasks/CaloCellQA/macros
+       )
+
+install(FILES
+                PHOS_TriggerQA/macros/AddTaskPHOSTriggerQA.C
+        DESTINATION
+                PWGGA/PHOSTasks/PHOS_TriggerQA/macros/
+       )
+
+install(FILES
+                PHOS_PbPbQA/macros/AddTaskPHOSPbPb.C
+        DESTINATION PWGGA/PHOSTasks/PHOS_PbPbQA/macros/
+       )
\ No newline at end of file

diff --git a/PWGHF/vertexingHF/CMakeLists.txt b/PWGHF/vertexingHF/CMakeLists.txt
index 6615b5ec9ae950f5f424f825f571fd9fcfd84664..a7e6e853b4cba60d2324d80440126e7fa9eb7787 100644 (file)
--- a/PWGHF/vertexingHF/CMakeLists.txt
+++ b/PWGHF/vertexingHF/CMakeLists.txt
@@ -129,15 +129,15 @@ install(TARGETS ${MODULE}
   LIBRARY DESTINATION lib)
 install(FILES ${HDRS} DESTINATION include)
 
-install ( FILES AliAODRecoDecayHF.h 
-         AliAODRecoDecayHF2Prong.h
-         AddD2HTrain.C 
-         ConfigVertexingHF.C 
-         ConfigVertexingHF_highmult.C 
-          DESTINATION PWGHF/vertexingHF/ )
+install(FILES
+            AliAODRecoDecayHF.h
+            AliAODRecoDecayHF2Prong.h
+            AddD2HTrain.C
+            ConfigVertexingHF.C
+            ConfigVertexingHF_highmult.C
+        DESTINATION 
+            PWGHF/vertexingHF/)
 
-install ( DIRECTORY macros
-          DESTINATION PWGHF/vertexingHF/
-          PATTERN ".d"  EXCLUDE
-          PATTERN ".so" EXCLUDE
-          PATTERN ".svn" EXCLUDE)
+install(DIRECTORY
+            macros
+        DESTINATION PWGHF/vertexingHF/)
\ No newline at end of file

diff --git a/PWGLF/FORWARD/CMakeLists.txt b/PWGLF/FORWARD/CMakeLists.txt
index f65e7817e793a8347b4dbae1a5d4221b345e0d21..050a9feec0aa8087e8c37c4b410f89a4eebc0c05 100644 (file)
--- a/PWGLF/FORWARD/CMakeLists.txt
+++ b/PWGLF/FORWARD/CMakeLists.txt
@@ -210,43 +210,26 @@ add_custom_target( install-PWGLFforward2.par
 install ( DIRECTORY analysis2/scripts 
          DESTINATION PWGLF/FORWARD/analysis2 
          USE_SOURCE_PERMISSIONS
-         PATTERN "*~"    EXCLUDE
-         PATTERN ".svn"  EXCLUDE
-         PATTERN "*.d"   EXCLUDE 
-         PATTERN "*.so"  EXCLUDE)
-
+         PATTERN "*~"    EXCLUDE)
+         
 # install QA scripts 
 install ( DIRECTORY analysis2/qa
          DESTINATION PWGLF/FORWARD/analysis2 
          USE_SOURCE_PERMISSIONS
-         PATTERN "*~"    EXCLUDE
-         PATTERN ".svn"  EXCLUDE
-         PATTERN "*.d"   EXCLUDE 
-         PATTERN "*.so"  EXCLUDE)
-
+         PATTERN "*~"    EXCLUDE)
 # install correction scripts 
 install ( DIRECTORY analysis2/corrs
          DESTINATION PWGLF/FORWARD/analysis2 
-         PATTERN "*~"    EXCLUDE
-         PATTERN ".svn"  EXCLUDE
-         PATTERN "*.d"   EXCLUDE 
-         PATTERN "*.so"  EXCLUDE)
-
+         PATTERN "*~"    EXCLUDE)
 # install trains 
 install ( DIRECTORY analysis2/trains 
          DESTINATION PWGLF/FORWARD/analysis2 
-         PATTERN "*~"   EXCLUDE
-         PATTERN ".svn" EXCLUDE
-         PATTERN "*.d"  EXCLUDE 
-         PATTERN "*.so" EXCLUDE)
-
+         PATTERN "*~"   EXCLUDE)
 # install trains 
 install ( DIRECTORY trains 
          DESTINATION PWGLF/FORWARD 
          FILES_MATCHING PATTERN "*.C"
-         PATTERN "*~"        EXCLUDE
-         PATTERN ".svn"      EXCLUDE)
-
+         PATTERN "*~"        EXCLUDE)
 # Install other scripts
 install ( FILES analysis2/AddTaskCentraldNdeta.C
                analysis2/AddTaskCentralMCCorr.C
@@ -304,11 +287,6 @@ install ( FILES analysis2/Run.sh
 
 # install sim 
 install ( DIRECTORY analysis2/sim 
-         DESTINATION PWGLF/FORWARD/analysis2 
-         PATTERN "*~"   EXCLUDE
-         PATTERN ".svn" EXCLUDE
-         PATTERN "*.d"  EXCLUDE 
-         PATTERN "*.so" EXCLUDE)
-       
+         DESTINATION PWGLF/FORWARD/analysis2)
 
 # --------------------------------------------------------------------

diff --git a/PWGLF/QATasks/CMakeLists.txt b/PWGLF/QATasks/CMakeLists.txt
index fb0d1b7058428162d2eae358830a63c04b04cd63..62abcac0c7f1a093d4a55277e8f40f2cebc6166e 100644 (file)
--- a/PWGLF/QATasks/CMakeLists.txt
+++ b/PWGLF/QATasks/CMakeLists.txt
@@ -69,3 +69,5 @@ install(TARGETS ${MODULE}
   ARCHIVE DESTINATION lib
   LIBRARY DESTINATION lib)
 install(FILES ${HDRS} DESTINATION include)
+
+install(DIRECTORY macros DESTINATION PWGLF/QATasks)

diff --git a/PWGPP/CMakeLists.txt b/PWGPP/CMakeLists.txt
index 0070218b119010f1796717d251ebe4107819636e..190b4b9d70cd6a30192d0e029d7500e977423ac1 100644 (file)
--- a/PWGPP/CMakeLists.txt
+++ b/PWGPP/CMakeLists.txt
@@ -274,40 +274,22 @@ install(TARGETS ${MODULE}
 install(FILES ${HDRS} DESTINATION include)
 
 # install macros as needed
-install ( DIRECTORY macros 
-         DESTINATION PWGPP 
-         PATTERN ".d"  EXCLUDE 
-         PATTERN ".so" EXCLUDE)
-install ( DIRECTORY CalibMacros 
-         DESTINATION PWGPP 
-         PATTERN ".d"  EXCLUDE 
-         PATTERN ".so" EXCLUDE)
-install ( DIRECTORY PilotTrain
-         DESTINATION PWGPP/ 
-         PATTERN ".d"  EXCLUDE 
-         PATTERN ".so" EXCLUDE)
-install ( FILES HMPID/AddTaskHmpidQA.C
-         DESTINATION PWGPP/HMPID)
-install ( FILES T0/AddTaskT0QA.C
-         DESTINATION PWGPP/T0)
-install ( FILES TOF/AddTaskTOFQA.C
-                TOF/AddTaskTOFqaID.C
-         DESTINATION PWGPP/TOF)
-install ( FILES TOF/AddTaskTOFQA.C
-         DESTINATION PWGPP/TOF)
-install ( DIRECTORY TPC/macros
-         DESTINATION PWGPP/TPC
-         PATTERN ".C")
-install ( DIRECTORY TRD
-         DESTINATION PWGPP)
-install ( FILES TRD/TRDPID/macros/AddTaskTRDPIDTree.C
-                TRD/TRDPID/macros/AddTaskTRDPIDmatching.C
-          DESTINATION PWGPP/TRD)
-install ( FILES ZDC/AddTaskZDCQA.C
-         DESTINATION PWGPP/ZDC)
-install ( FILES PilotTrain/AddTaskMuonQA.C
-         DESTINATION PWGPP/PilotTrain/ )
-install ( FILES VZERO/AddTaskVZEROPbPb.C
-          DESTINATION PWGPP/VZERO/ )
+install(DIRECTORY macros DESTINATION PWGPP)
+install(DIRECTORY CalibMacros DESTINATION PWGPP)
+install(DIRECTORY PilotTrain DESTINATION PWGPP)
+install(FILES HMPID/AddTaskHmpidQA.C DESTINATION PWGPP/HMPID)
+install(FILES T0/AddTaskT0QA.C  DESTINATION PWGPP/T0)
+install(FILES TOF/AddTaskTOFQA.C
+              TOF/AddTaskTOFqaID.C
+        DESTINATION PWGPP/TOF)
+install(FILES TOF/AddTaskTOFQA.C DESTINATION PWGPP/TOF)
+install(DIRECTORY TPC/macros DESTINATION PWGPP/TPC PATTERN ".C")
+install(DIRECTORY TRD DESTINATION PWGPP)
+install(FILES TRD/TRDPID/macros/AddTaskTRDPIDTree.C
+            TRD/TRDPID/macros/AddTaskTRDPIDmatching.C
+         DESTINATION PWGPP/TRD)
+install(FILES ZDC/AddTaskZDCQA.C DESTINATION PWGPP/ZDC)
+install(FILES PilotTrain/AddTaskMuonQA.C DESTINATION PWGPP/PilotTrain/ )
+install(FILES VZERO/AddTaskVZEROPbPb.C DESTINATION PWGPP/VZERO/)
 
 message(STATUS "PWGPP enabled")

diff --git a/PWGUD/UPC/CMakeLists.txt b/PWGUD/UPC/CMakeLists.txt
index a855efc2cdc58ec9f1b6731b732aaefdaa971298..a28cb8cf7699aabc4eb7fcb3268e8e6fc5c02c05 100644 (file)
--- a/PWGUD/UPC/CMakeLists.txt
+++ b/PWGUD/UPC/CMakeLists.txt
@@ -99,4 +99,7 @@ install(TARGETS ${MODULE}
         ARCHIVE DESTINATION lib
         LIBRARY DESTINATION lib)
 
-install(FILES ${HDRS} DESTINATION include)
\ No newline at end of file
+install(FILES ${HDRS} DESTINATION include)
+
+# Install macros
+install(FILES AddTaskUpcPsi2s.C DESTINATION PWGUD/UPC)
\ No newline at end of file