Restore AliLog per module behavior

vkucera · Feb 11, 2016 · 3a51fe7 · 3a51fe7
1 parent a568356
commit 3a51fe7
Show file tree

Hide file tree

Showing 87 changed files with 146 additions and 61 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,14 +6,11 @@ cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
 
 project(AliPhysics CXX C)
 
-### CMP0025   Compiler id for Apple Clang is now AppleClang.
-### CMP0042   MACOSX_RPATH is enabled by default.
-foreach(p
-  CMP0025 # CMake 3.0
-  CMP0042 # CMake 3.0
-  )
+foreach(p CMP0005  # Properly escape preprocessor definitions (v2.6, v3.0.2)
+          CMP0025  # Compiler id for Apple Clang is now AppleClang (v3.0)
+          CMP0042) # MACOSX_RPATH is enabled by default (v3.0)
   if(POLICY ${p})
-  cmake_policy(SET ${p} NEW)
+    cmake_policy(SET ${p} NEW)
   endif()
 endforeach()
 

diff --git a/CORRFW/CMakeLists.txt b/CORRFW/CMakeLists.txt
@@ -15,6 +15,7 @@
 
 # Module
 set(MODULE CORRFW)
+add_definitions(-D_MODULE_="${MODULE}")
 
 # Module include folder
 include_directories(${AliPhysics_SOURCE_DIR}/${MODULE})

diff --git a/EVEANALYSIS/CMakeLists.txt b/EVEANALYSIS/CMakeLists.txt
@@ -15,6 +15,7 @@
 
 # Module
 set(MODULE EveAnalysis)
+add_definitions(-D_MODULE_="${MODULE}")
 
 # Module include folder
 include_directories(${AliPhysics_SOURCE_DIR}/EVEANALYSIS)

diff --git a/EVENTMIX/CMakeLists.txt b/EVENTMIX/CMakeLists.txt
@@ -15,6 +15,7 @@
 
 # Module
 set(MODULE EventMixing)
+add_definitions(-D_MODULE_="${MODULE}")
 
 # Module include folder
 include_directories(${AliPhysics_SOURCE_DIR}/EVENTMIX)

diff --git a/HLTANALYSIS/JET/CMakeLists.txt b/HLTANALYSIS/JET/CMakeLists.txt
@@ -15,6 +15,7 @@
 
 # Module
 set(MODULE AliHLTJET)
+add_definitions(-D_MODULE_="${MODULE}")
 
 # Module include folder
 include_directories(${AliPhysics_SOURCE_DIR}/HLTANALYSIS/JET

diff --git a/JETAN/FASTJETAN/CMakeLists.txt b/JETAN/FASTJETAN/CMakeLists.txt
@@ -15,6 +15,7 @@
 
 # Module
 set(MODULE FASTJETAN)
+add_definitions(-D_MODULE_="${MODULE}")
 
 # Module include folder
 include_directories(${AliPhysics_SOURCE_DIR}/JETAN/${MODULE})

diff --git a/JETAN/JETAN/CMakeLists.txt b/JETAN/JETAN/CMakeLists.txt
@@ -15,6 +15,7 @@
 
 # Module
 set(MODULE JETAN)
+add_definitions(-D_MODULE_="${MODULE}")
 
 # Module include folder
 include_directories(${AliPhysics_SOURCE_DIR}/JETAN/${MODULE})

diff --git a/OADB/CMakeLists.txt b/OADB/CMakeLists.txt
@@ -15,6 +15,7 @@
 
 # Module
 set(MODULE OADB)
+add_definitions(-D_MODULE_="${MODULE}")
 
 # Module include folder
 include_directories(${AliPhysics_SOURCE_DIR}/${MODULE})

diff --git a/PWG/CaloTrackCorrBase/CMakeLists.txt b/PWG/CaloTrackCorrBase/CMakeLists.txt
@@ -14,7 +14,8 @@
 # **************************************************************************/
 
 #Module
-set (MODULE PWGCaloTrackCorrBase)
+set(MODULE PWGCaloTrackCorrBase)
+add_definitions(-D_MODULE_="${MODULE}")
 
 # Module include folder
 include_directories(${AliPhysics_SOURCE_DIR}/PWG/CaloTrackCorrBase)

diff --git a/PWG/DevNanoAOD/CMakeLists.txt b/PWG/DevNanoAOD/CMakeLists.txt
@@ -14,7 +14,8 @@
 # **************************************************************************/
 
 #Module
-set (MODULE PWGDevNanoAOD)
+set(MODULE PWGDevNanoAOD)
+add_definitions(-D_MODULE_="${MODULE}")
 
 # Module include folder
 include_directories(${AliPhysics_SOURCE_DIR}/PWG/DevNanoAOD)

diff --git a/PWG/EMCAL/CMakeLists.txt b/PWG/EMCAL/CMakeLists.txt
@@ -14,7 +14,8 @@
 # **************************************************************************/
 
 #Module
-set (MODULE PWGEMCAL)
+set(MODULE PWGEMCAL)
+add_definitions(-D_MODULE_="${MODULE}")
 
 # Module include folder
 include_directories(${AliPhysics_SOURCE_DIR}/PWG/EMCAL)

diff --git a/PWG/FLOW/Base/CMakeLists.txt b/PWG/FLOW/Base/CMakeLists.txt
@@ -14,7 +14,8 @@
 # **************************************************************************/
 
 #Module
-set (MODULE PWGflowBase)
+set(MODULE PWGflowBase)
+add_definitions(-D_MODULE_="${MODULE}")
 
 # Module include folder
 include_directories(${AliPhysics_SOURCE_DIR}/PWG/FLOW/Base)

diff --git a/PWG/FLOW/Tasks/CMakeLists.txt b/PWG/FLOW/Tasks/CMakeLists.txt
@@ -14,7 +14,8 @@
 # **************************************************************************/
 
 #Module
-set (MODULE PWGflowTasks)
+set(MODULE PWGflowTasks)
+add_definitions(-D_MODULE_="${MODULE}")
 
 # Module include folder
 include_directories(${AliPhysics_SOURCE_DIR}/PWG/FLOW/Tasks)

diff --git a/PWG/Glauber/CMakeLists.txt b/PWG/Glauber/CMakeLists.txt
@@ -14,7 +14,8 @@
 # **************************************************************************/
 
 #Module
-set (MODULE PWGGlauber)
+set(MODULE PWGGlauber)
+add_definitions(-D_MODULE_="${MODULE}")
 
 # Module include folder
 include_directories(${AliPhysics_SOURCE_DIR}/PWG/Glauber)

diff --git a/PWG/HMTF/CMakeLists.txt b/PWG/HMTF/CMakeLists.txt
@@ -14,7 +14,8 @@
 # **************************************************************************/
 
 #Module
-set (MODULE PWGHMTF)
+set(MODULE PWGHMTF)
+add_definitions(-D_MODULE_="${MODULE}")
 
 # Module include folder
 include_directories(${AliPhysics_SOURCE_DIR}/PWG/HMTF)

diff --git a/PWG/JETFW/CMakeLists.txt b/PWG/JETFW/CMakeLists.txt
@@ -14,6 +14,7 @@
 # **************************************************************************
 
 set(MODULE PWGJETFW)
+add_definitions(-D_MODULE_="${MODULE}")
 
 # Module include folder
 include_directories(

diff --git a/PWG/MCLEGO/CMakeLists.txt b/PWG/MCLEGO/CMakeLists.txt
@@ -14,7 +14,8 @@
 # **************************************************************************/
 
 #Module
-set (MODULE PWGMCLEGO)
+set(MODULE PWGMCLEGO)
+add_definitions(-D_MODULE_="${MODULE}")
 
 # install all executable scripts
 install(DIRECTORY .

diff --git a/PWG/TRD/CMakeLists.txt b/PWG/TRD/CMakeLists.txt
@@ -14,7 +14,8 @@
 # **************************************************************************/
 
 #Module
-set (MODULE PWGTRD)
+set(MODULE PWGTRD)
+add_definitions(-D_MODULE_="${MODULE}")
 
 # Module include folder
 include_directories(${AliPhysics_SOURCE_DIR}/PWG/TRD)

diff --git a/PWG/Tools/CMakeLists.txt b/PWG/Tools/CMakeLists.txt
@@ -14,7 +14,8 @@
 # **************************************************************************/
 
 #Module
-set (MODULE PWGTools)
+set(MODULE PWGTools)
+add_definitions(-D_MODULE_="${MODULE}")
 
 # Module include folder
 include_directories(${AliPhysics_SOURCE_DIR}/PWG/Tools)

diff --git a/PWG/mftmuondep/charmonium/CMakeLists.txt b/PWG/mftmuondep/charmonium/CMakeLists.txt
@@ -14,7 +14,8 @@
 # **************************************************************************
 
 # Module name -> library name
-set (MODULE PWGmftmuondepCharmonium)
+set(MODULE PWGmftmuondepCharmonium)
+add_definitions(-D_MODULE_="${MODULE}")
 
 # Module include folder
 include_directories(${AliPhysics_SOURCE_DIR}/PWG/mftmuondep/charmonium)

diff --git a/PWG/mftmuondep/openHF/CMakeLists.txt b/PWG/mftmuondep/openHF/CMakeLists.txt
@@ -15,6 +15,7 @@
 
 #Module
 set(MODULE PWGSomething)
+add_definitions(-D_MODULE_="${MODULE}")
 
 # Module include folder
 include_directories(${AliPhysics_SOURCE_DIR}/PWG/mftmuondep/openHF)

diff --git a/PWG/muon/CMakeLists.txt b/PWG/muon/CMakeLists.txt
@@ -20,7 +20,8 @@ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} -DLOG_NO_DEBUG ")
 set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS} ")
 
 #Module
-set (MODULE PWGmuon)
+set(MODULE PWGmuon)
+add_definitions(-D_MODULE_="${MODULE}")
 
 add_subdirectory(aaf)
 message(STATUS "PWG muon aaf enabled")

diff --git a/PWG/muon/aaf/CMakeLists.txt b/PWG/muon/aaf/CMakeLists.txt
@@ -15,6 +15,7 @@
 
 #Module
 set(MODULE PWGmuonaaf)
+add_definitions(-D_MODULE_="${MODULE}")
 
 # Module include folder
 include_directories(${AliPhysics_SOURCE_DIR}/PWG/muon/aaf)

diff --git a/PWG/muondep/CMakeLists.txt b/PWG/muondep/CMakeLists.txt
@@ -14,7 +14,8 @@
 # **************************************************************************/
 
 #Module
-set (MODULE PWGmuondep)
+set(MODULE PWGmuondep)
+add_definitions(-D_MODULE_="${MODULE}")
 
 # Module include folder
 include_directories(${AliPhysics_SOURCE_DIR}/PWG/muondep)

diff --git a/PWGCF/Correlations/Base/CMakeLists.txt b/PWGCF/Correlations/Base/CMakeLists.txt
@@ -14,7 +14,8 @@
 # **************************************************************************/
 
 #Module
-set (MODULE PWGCFCorrelationsBase)
+set(MODULE PWGCFCorrelationsBase)
+add_definitions(-D_MODULE_="${MODULE}")
 
 # Module include folder
 include_directories(${AliPhysics_SOURCE_DIR}/PWGCF/Correlations/Base)

diff --git a/PWGCF/Correlations/DPhi/CMakeLists.txt b/PWGCF/Correlations/DPhi/CMakeLists.txt
@@ -14,7 +14,8 @@
 # **************************************************************************/
 
 #Module
-set (MODULE PWGCFCorrelationsDPhi)
+set(MODULE PWGCFCorrelationsDPhi)
+add_definitions(-D_MODULE_="${MODULE}")
 
 # Module include folder
 include_directories(${AliPhysics_SOURCE_DIR}/PWGCF/Correlations/DPhi)

diff --git a/PWGCF/Correlations/JCORRAN/Base/CMakeLists.txt b/PWGCF/Correlations/JCORRAN/Base/CMakeLists.txt
@@ -14,7 +14,8 @@
 # **************************************************************************/
 
 #Module
-set (MODULE PWGCFCorrelationsJCORRAN)
+set(MODULE PWGCFCorrelationsJCORRAN)
+add_definitions(-D_MODULE_="${MODULE}")
 
 # Module include folder
 include_directories(${AliPhysics_SOURCE_DIR}/PWGCF/Correlations/JCORRAN/Base)

diff --git a/PWGCF/Correlations/JCORRAN/Pro/CMakeLists.txt b/PWGCF/Correlations/JCORRAN/Pro/CMakeLists.txt
@@ -14,7 +14,8 @@
 # **************************************************************************/
 
 #Module
-set (MODULE PWGCFCorrelationsJCORRANPro)
+set(MODULE PWGCFCorrelationsJCORRANPro)
+add_definitions(-D_MODULE_="${MODULE}")
 
 # Module include folder
 include_directories(${AliPhysics_SOURCE_DIR}/PWGCF/Correlations/JCORRAN/Base

diff --git a/PWGCF/Correlations/ThreePart/CMakeLists.txt b/PWGCF/Correlations/ThreePart/CMakeLists.txt
@@ -14,7 +14,8 @@
 # **************************************************************************/
 
 #Module
-set (MODULE PWGCFCorrelationsThreePart)
+set(MODULE PWGCFCorrelationsThreePart)
+add_definitions(-D_MODULE_="${MODULE}")
 
 # Module include folder
 include_directories(${AliPhysics_SOURCE_DIR}/PWGCF/Correlations/ThreePart)

diff --git a/PWGCF/EBYE/CMakeLists.txt b/PWGCF/EBYE/CMakeLists.txt
@@ -14,7 +14,8 @@
 # **************************************************************************/
 
 #Module
-set (MODULE PWGCFebye)
+set(MODULE PWGCFebye)
+add_definitions(-D_MODULE_="${MODULE}")
 
 # Module include folder
 include_directories(${AliPhysics_SOURCE_DIR}/PWGCF/EBYE)

diff --git a/PWGCF/FEMTOSCOPY/AliFemto/CMakeLists.txt b/PWGCF/FEMTOSCOPY/AliFemto/CMakeLists.txt
@@ -1,6 +1,7 @@
 
 #Module
-set (MODULE PWGCFfemtoscopy)
+set(MODULE PWGCFfemtoscopy)
+add_definitions(-D_MODULE_="${MODULE}")
 
 # Module include folder
 include_directories(${AliPhysics_SOURCE_DIR}/PWGCF/FEMTOSCOPY/AliFemto)

diff --git a/PWGCF/FEMTOSCOPY/AliFemtoUser/CMakeLists.txt b/PWGCF/FEMTOSCOPY/AliFemtoUser/CMakeLists.txt
@@ -14,7 +14,8 @@
 # **************************************************************************/
 
 #Module
-set (MODULE PWGCFfemtoscopyUser)
+set(MODULE PWGCFfemtoscopyUser)
+add_definitions(-D_MODULE_="${MODULE}")
 
 # Module include folder
 include_directories(${AliPhysics_SOURCE_DIR}/PWGCF/FEMTOSCOPY/AliFemtoUser)

diff --git a/PWGCF/FEMTOSCOPY/Chaoticity/CMakeLists.txt b/PWGCF/FEMTOSCOPY/Chaoticity/CMakeLists.txt
@@ -14,7 +14,8 @@
 # **************************************************************************/
 
 #Module
-set (MODULE PWGCFChaoticity)
+set(MODULE PWGCFChaoticity)
+add_definitions(-D_MODULE_="${MODULE}")
 
 # Module include folder
 include_directories(${AliPhysics_SOURCE_DIR}/PWGCF/FEMTOSCOPY/Chaoticity)

diff --git a/PWGCF/FEMTOSCOPY/ESE/CMakeLists.txt b/PWGCF/FEMTOSCOPY/ESE/CMakeLists.txt
@@ -14,7 +14,8 @@
 # **************************************************************************/
 
 #Module
-set (MODULE PWGCFESE)
+set(MODULE PWGCFESE)
+add_definitions(-D_MODULE_="${MODULE}")
 
 # Module include folder
 include_directories(${AliPhysics_SOURCE_DIR}/PWGCF/FEMTOSCOPY/ESE)

diff --git a/PWGCF/FEMTOSCOPY/HCascadeAnalysis/CMakeLists.txt b/PWGCF/FEMTOSCOPY/HCascadeAnalysis/CMakeLists.txt
@@ -14,7 +14,8 @@
 # **************************************************************************/
 
 #Module
-set (MODULE PWGCFHCascadeAnalysis)
+set(MODULE PWGCFHCascadeAnalysis)
+add_definitions(-D_MODULE_="${MODULE}")
 
 # Module include folder
 include_directories(${AliPhysics_SOURCE_DIR}/PWGCF/FEMTOSCOPY/HCascadeAnalysis)

diff --git a/PWGCF/FEMTOSCOPY/K0Analysis/CMakeLists.txt b/PWGCF/FEMTOSCOPY/K0Analysis/CMakeLists.txt
@@ -14,7 +14,8 @@
 # **************************************************************************/
 
 #Module
-set (MODULE PWGCFK0Analysis)
+set(MODULE PWGCFK0Analysis)
+add_definitions(-D_MODULE_="${MODULE}")
 
 # Module include folder
 include_directories(${AliPhysics_SOURCE_DIR}/PWGCF/FEMTOSCOPY/K0Analysis)

diff --git a/PWGCF/FEMTOSCOPY/UNICOR/CMakeLists.txt b/PWGCF/FEMTOSCOPY/UNICOR/CMakeLists.txt
@@ -14,7 +14,8 @@
 # **************************************************************************/
 
 #Module
-set (MODULE PWGCFunicor)
+set(MODULE PWGCFunicor)
+add_definitions(-D_MODULE_="${MODULE}")
 
 # Module include folder
 include_directories(${AliPhysics_SOURCE_DIR}/PWGCF/FEMTOSCOPY/UNICOR)

diff --git a/PWGCF/FEMTOSCOPYAOD/CMakeLists.txt b/PWGCF/FEMTOSCOPYAOD/CMakeLists.txt
@@ -14,7 +14,8 @@
 # **************************************************************************/
 
 #Module
-set (MODULE PWGCFFEMTOSCOPYAOD)
+set(MODULE PWGCFFEMTOSCOPYAOD)
+add_definitions(-D_MODULE_="${MODULE}")
 
 # Module include folder
 include_directories(${AliPhysics_SOURCE_DIR}/PWGCF/FEMTOSCOPYAOD)

diff --git a/PWGCF/FLOW/CME/CMakeLists.txt b/PWGCF/FLOW/CME/CMakeLists.txt
@@ -14,7 +14,8 @@
 # **************************************************************************/
 
 #Module
-set (MODULE PWGCFflowCME)
+set(MODULE PWGCFflowCME)
+add_definitions(-D_MODULE_="${MODULE}")
 
 # Module include folder
 include_directories(${AliPhysics_SOURCE_DIR}/PWGCF/FLOW/CME)

diff --git a/PWGCF/FLOW/CME/TwoPwrtRP/CMakeLists.txt b/PWGCF/FLOW/CME/TwoPwrtRP/CMakeLists.txt
@@ -14,7 +14,8 @@
 # **************************************************************************/
 
 #Module
-set (MODULE PWGCFflowCMETwoPwrtRP)
+set(MODULE PWGCFflowCMETwoPwrtRP)
+add_definitions(-D_MODULE_="${MODULE}")
 
 # Module include folder
 include_directories(${AliPhysics_SOURCE_DIR}/PWGCF/FLOW/CME/TwoPwrtRP)

diff --git a/PWGCF/FLOW/blastwave/CMakeLists.txt b/PWGCF/FLOW/blastwave/CMakeLists.txt
@@ -14,7 +14,8 @@
 # **************************************************************************/
 
 #Module
-set (MODULE PWGCFflowBW)
+set(MODULE PWGCFflowBW)
+add_definitions(-D_MODULE_="${MODULE}")
 
 # Module include folder
 include_directories(${AliPhysics_SOURCE_DIR}/PWGCF/FLOW/blastwave)