Converting PWGCaloTrackCorrBase to native cmake

diff --git a/PWG/CMakeLists.txt b/PWG/CMakeLists.txt
index 1a85600e2725ebbefb082e56223c18f5ddddf4be..ce8fef45067946cb34cf1e1dea0587ff83a68777 100644 (file)
--- a/PWG/CMakeLists.txt
+++ b/PWG/CMakeLists.txt
@@ -21,6 +21,7 @@ add_subdirectory (EMCAL)
 add_subdirectory (FLOW)
 add_subdirectory (TRD)
 add_subdirectory (muondep)
+add_subdirectory (CaloTrackCorrBase)
 
 # Needs PWGLFspectra
 # add_subdirectory (DevNanoAOD)

diff --git a/PWG/CMakelibPWGCaloTrackCorrBase.pkg b/PWG/CMakelibPWGCaloTrackCorrBase.pkg
deleted file mode 100644 (file)
index ab95129..0000000
--- a/PWG/CMakelibPWGCaloTrackCorrBase.pkg
+++ /dev/null
@@ -1,55 +0,0 @@
-# -*- mode: CMake -*-
-#--------------------------------------------------------------------------------#
-# Package File for PWGCaloTrackCorrBase                                              #
-# Author : Johny Jose (johny.jose@cern.ch)                                       #
-# Variables Defined :                                                            #
-#                                                                                #
-# SRCS - C++ source files                                                        #
-# HDRS - C++ header files                                                        #
-# DHDR - ROOT Dictionary Linkdef header file                                     #
-# CSRCS - C source files                                                         #
-# CHDRS - C header files                                                         #
-# EINCLUDE - Include directories                                                 #
-# EDEFINE - Compiler definitions                                                 #
-# ELIBS - Extra libraries to link                                                #
-# ELIBSDIR - Extra library directories                                           #
-# PACKFFLAGS - Fortran compiler flags for package                                #
-# PACKCXXFLAGS - C++ compiler flags for package                                  #
-# PACKCFLAGS - C compiler flags for package                                      #
-# PACKSOFLAGS - Shared library linking flags                                     #
-# PACKLDFLAGS - Module linker flags                                              #
-# PACKBLIBS - Libraries to link (Executables only)                               #
-# EXPORT - Header files to be exported                                           #
-# CINTHDRS - Dictionary header files                                             #
-# CINTAUTOLINK - Set automatic dictionary generation                             #
-# ARLIBS - Archive Libraries and objects for linking (Executables only)          #
-# SHLIBS - Shared Libraries and objects for linking (Executables only)           #
-#--------------------------------------------------------------------------------#
-
-set ( SRCS  
-    CaloTrackCorrBase/AliNeutralMesonSelection.cxx 
-    CaloTrackCorrBase/AliFiducialCut.cxx 
-    CaloTrackCorrBase/AliCaloPID.cxx 
-    CaloTrackCorrBase/AliMCAnalysisUtils.cxx 
-    CaloTrackCorrBase/AliIsolationCut.cxx 
-    CaloTrackCorrBase/AliAnaScale.cxx 
-    CaloTrackCorrBase/AliCaloTrackReader.cxx 
-    CaloTrackCorrBase/AliCaloTrackESDReader.cxx 
-    CaloTrackCorrBase/AliCaloTrackAODReader.cxx 
-    CaloTrackCorrBase/AliCaloTrackMCReader.cxx 
-    CaloTrackCorrBase/AliCalorimeterUtils.cxx 
-    CaloTrackCorrBase/AliAnalysisTaskCounter.cxx 
-    CaloTrackCorrBase/AliAnaCaloTrackCorrMaker.cxx
-    CaloTrackCorrBase/AliAnaCaloTrackCorrBaseClass.cxx
-    CaloTrackCorrBase/AliAnalysisTaskCaloTrackCorrelation.cxx
-    CaloTrackCorrBase/AliAnalysisTaskCaloTrackCorrelationM.cxx
-    CaloTrackCorrBase/AliHistogramRanges.cxx
-    )
-
-string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )
-
-set ( DHDR  PWGCaloTrackCorrBaseLinkDef.h)
-
-set ( EINCLUDE PWG/CaloTrackCorrBase EMCAL PHOS OADB STEER/AOD STEER/ESD STEER/STEERBase ANALYSIS)
-
-string ( REPLACE ".cxx" ".h" EXPORT "${SRCS}" )

diff --git a/PWG/CaloTrackCorrBase/CMakeLists.txt b/PWG/CaloTrackCorrBase/CMakeLists.txt
new file mode 100644 (file)
index 0000000..c62fec6
--- /dev/null
+++ b/PWG/CaloTrackCorrBase/CMakeLists.txt
@@ -0,0 +1,85 @@
+# **************************************************************************
+# * Copyright(c) 1998-2014, ALICE Experiment at CERN, All rights reserved. *
+# *                                                                        *
+# * Author: The ALICE Off-line Project.                                    *
+# * Contributors are mentioned in the code where appropriate.              *
+# *                                                                        *
+# * Permission to use, copy, modify and distribute this software and its   *
+# * documentation strictly for non-commercial purposes is hereby granted   *
+# * without fee, provided that the above copyright notice appears in all   *
+# * copies and that both the copyright notice and this permission notice   *
+# * appear in the supporting documentation. The authors make no claims     *
+# * about the suitability of this software for any purpose. It is          *
+# * provided "as is" without express or implied warranty.                  *
+# **************************************************************************/
+
+#Module
+set (MODULE PWGCaloTrackCorrBase)
+
+# Module include folder
+include_directories(${AliRoot_SOURCE_DIR}/PWG/CaloTrackCorrBase)
+
+# Additional includes - alphabetical order except ROOT
+include_directories(${ROOT_INCLUDE_DIRS}
+                    ${AliRoot_SOURCE_DIR}/ANALYSIS/ANALYSIS
+                    ${AliRoot_SOURCE_DIR}/ANALYSIS/ANALYSISalice
+                    ${AliRoot_SOURCE_DIR}/EMCAL/EMCALUtils
+                    ${AliRoot_SOURCE_DIR}/PHOS/PHOSUtils
+                    ${AliRoot_SOURCE_DIR}/STEER/AOD
+                    ${AliRoot_SOURCE_DIR}/STEER/ESD
+                    ${AliRoot_SOURCE_DIR}/STEER/STEERBase
+  )
+
+# Sources - alphabetical order
+set(SRCS
+  AliNeutralMesonSelection.cxx 
+  AliFiducialCut.cxx 
+  AliCaloPID.cxx 
+  AliMCAnalysisUtils.cxx 
+  AliIsolationCut.cxx 
+  AliAnaScale.cxx 
+  AliCaloTrackReader.cxx 
+  AliCaloTrackESDReader.cxx 
+  AliCaloTrackAODReader.cxx 
+  AliCaloTrackMCReader.cxx 
+  AliCalorimeterUtils.cxx 
+  AliAnalysisTaskCounter.cxx 
+  AliAnaCaloTrackCorrMaker.cxx
+  AliAnaCaloTrackCorrBaseClass.cxx
+  AliAnalysisTaskCaloTrackCorrelation.cxx
+  AliAnalysisTaskCaloTrackCorrelationM.cxx
+  AliHistogramRanges.cxx
+  )
+
+# Headers from sources
+string(REPLACE ".cxx" ".h" HDRS "${SRCS}")
+
+# Generate the dictionary
+# It will create G_ARG1.cxx and G_ARG1.h / ARG1 = function first argument
+get_directory_property(incdirs INCLUDE_DIRECTORIES)
+generate_dictionary("${MODULE}" "${MODULE}LinkDef.h" "${HDRS}" "${incdirs}")
+
+# Add a shared library
+add_library(${MODULE} SHARED  ${SRCS} G__${MODULE}.cxx)
+
+# Generate the ROOT map
+# Dependecies
+set(LIBDEPS ANALYSISalice EMCALUtils PHOSUtils)
+generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE}LinkDef.h")
+
+# Linking the library
+target_link_libraries(${MODULE} ${LIBDEPS})
+
+# Public include folders that will be propagated to the dependecies
+target_include_directories(${MODULE} PUBLIC ${incdirs})
+
+# System dependent: Modify the way the library is build
+if(${CMAKE_SYSTEM} MATCHES Darwin)
+    set_target_properties(${MODULE} PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
+endif(${CMAKE_SYSTEM} MATCHES Darwin)
+
+# Installation
+install(TARGETS ${MODULE} 
+  ARCHIVE DESTINATION lib
+  LIBRARY DESTINATION lib)
+install(FILES ${HDRS} DESTINATION include)

diff --git a/PWG/PWGCaloTrackCorrBaseLinkDef.h b/PWG/CaloTrackCorrBase/PWGCaloTrackCorrBaseLinkDef.h
similarity index 100%
rename from PWG/PWGCaloTrackCorrBaseLinkDef.h
rename to PWG/CaloTrackCorrBase/PWGCaloTrackCorrBaseLinkDef.h