inserting missing lib PWGCFCorrelationsJCORRANPro back - new library files + remove...
authorlmilano <lmilano@cern.ch>
Wed, 17 Dec 2014 08:34:42 +0000 (09:34 +0100)
committerlmilano <lmilano@cern.ch>
Wed, 17 Dec 2014 08:34:42 +0000 (09:34 +0100)
PWGCF/CMakelibPWGCFCorrelationsJCORRANPro.pkg [deleted file]
PWGCF/Correlations/JCORRAN/CMakeListsJCORRAN.cfg [new file with mode: 0644]
PWGCF/Correlations/JCORRAN/CMakeListsJCORRANPro.cfg [new file with mode: 0644]
PWGCF/Correlations/JCORRAN/PWGCFCorrelationsJCORRANProLinkDef.h [moved from PWGCF/PWGCFCorrelationsJCORRANProLinkDef.h with 100% similarity]

diff --git a/PWGCF/CMakelibPWGCFCorrelationsJCORRANPro.pkg b/PWGCF/CMakelibPWGCFCorrelationsJCORRANPro.pkg
deleted file mode 100644 (file)
index a7fdcb2..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-
-# -*- mode: CMake -*-
-#--------------------------------------------------------------------------------#
-# Package File for PWGCF/Correlations/JCORRAN                                    #
-# Author : D.J Kim (Dong.Jo.Kim@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  
-       Correlations/JCORRAN/AliJEbeHistos.cxx
-       Correlations/JCORRAN/AliJEbePercentile.cxx
-       Correlations/JCORRAN/AliJEbECORRTask.cxx
-       Correlations/JCORRAN/AliJJetTask.cxx
-       Correlations/JCORRAN/AliJDiJetAnalysis.cxx
-       Correlations/JCORRAN/AliJDiJetTask.cxx
-       Correlations/JCORRAN/AliJJetCORRAnalysis.cxx
-       Correlations/JCORRAN/AliJJetCORRTask.cxx
-    Correlations/JCORRAN/AliJJetJtAnalysis.cxx
-    Correlations/JCORRAN/AliJJetJtTask.cxx
-)
-
-string ( REPLACE ".cxx" ".h" HDRS "${SRCS}"  )
-
-set ( DHDR  PWGCFCorrelationsJCORRANProLinkDef.h )
-
-string ( REPLACE ".cxx" ".h" EXPORT "${SRCS}" )
-
-set ( EINCLUDE ANALYSIS CORRFW PWGCF/Correlations/JCORRAN PWG/Tools PWG/EMCAL PWGJE/EMCALJetTasks PWGJE/EMCALJetTasks/UserTasks OADB STEER/AOD STEER/ESD STEER/STEERBase EMCAL PHOS )
-
-
diff --git a/PWGCF/Correlations/JCORRAN/CMakeListsJCORRAN.cfg b/PWGCF/Correlations/JCORRAN/CMakeListsJCORRAN.cfg
new file mode 100644 (file)
index 0000000..080e777
--- /dev/null
@@ -0,0 +1,94 @@
+# **************************************************************************
+# * 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 PWGCFCorrelationsJCORRAN)
+
+# Module include folder
+include_directories(${AliRoot_SOURCE_DIR}/PWGCF/Correlations/JCORRAN)
+
+# 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
+  AliJCORRAN.cxx
+  AliJTrackCounter.cxx
+  AliJCORRANTask.cxx
+  AliJEfficiencyTask.cxx
+  AliJDiHadronCorrTask.cxx
+  AliJFilter.cxx
+  AliJEfficiencyScanner.cxx
+  AliJBaseEventHeader.cxx
+  AliJBaseTrack.cxx
+  AliJEventHeader.cxx
+  AliJJet.cxx
+  AliJMCTrack.cxx
+  AliJPhoton.cxx
+  AliJPiZero.cxx
+  AliJRunHeader.cxx
+  AliJTrack.cxx
+  AliJHistManager.cxx
+  AliJCorrelations.cxx
+  AliJDataManager.cxx
+  AliJRunTable.cxx
+  AliJHistos.cxx
+  AliJEventPool.cxx
+  AliJEfficiency.cxx
+  AliJTrackCut.cxx
+  AliJBaseCard.cxx
+  AliJCard.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 CORRFW 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/PWGCF/Correlations/JCORRAN/CMakeListsJCORRANPro.cfg b/PWGCF/Correlations/JCORRAN/CMakeListsJCORRANPro.cfg
new file mode 100644 (file)
index 0000000..424f998
--- /dev/null
@@ -0,0 +1,86 @@
+# **************************************************************************
+# * 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 PWGCFCorrelationsJCORRANPro)
+
+# Module include folder
+include_directories(${AliRoot_SOURCE_DIR}/PWGCF/Correlations/JCORRAN)
+
+# Additional includes - alphabetical order except ROOT
+include_directories(${ROOT_INCLUDE_DIRS}
+                    ${AliRoot_SOURCE_DIR}/ANALYSIS/ANALYSIS
+                    ${AliRoot_SOURCE_DIR}/ANALYSIS/ANALYSISalice
+                    ${AliRoot_SOURCE_DIR}/CORRFW
+                    ${AliRoot_SOURCE_DIR}/PWG/Tools
+                    ${AliRoot_SOURCE_DIR}/PWG/EMCAL
+                    ${AliRoot_SOURCE_DIR}/EMCAL/EMCALUtils
+                    ${AliRoot_SOURCE_DIR}/PWGJE/EMCALJetTasks
+                    ${AliRoot_SOURCE_DIR}/PWGJE/EMCALJetTasks/UserTasks
+                    ${AliRoot_SOURCE_DIR}/OADB
+                    ${AliRoot_SOURCE_DIR}/EMCAL
+                    ${AliRoot_SOURCE_DIR}/PHOS
+                    ${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
+       AliJEbeHistos.cxx
+       AliJEbePercentile.cxx
+       AliJEbECORRTask.cxx
+       AliJJetTask.cxx
+       AliJDiJetAnalysis.cxx
+       AliJDiJetTask.cxx
+       AliJJetCORRAnalysis.cxx
+       AliJJetCORRTask.cxx
+       AliJJetJtAnalysis.cxx
+       AliJJetJtTask.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 CORRFW 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)