CORRFW

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cfac63f31a761007696bec7e313d5ef5b05e8cb3..483f76dfde68d79e7a035b38c9d598f76f5d88b1 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -92,7 +92,7 @@ add_subdirectory(EMCAL)
 add_subdirectory(PHOS)
 add_subdirectory(TRIGGER)
 add_subdirectory(BCM)
-#add_subdirectory (CORRFW)
+add_subdirectory(CORRFW)
 #add_subdirectory (FASTSIM)
 #if(CMAKE_Fortran_COMPILER_WORKS)
 #  add_subdirectory (LHAPDF)

diff --git a/CORRFW/CMakeLists.txt b/CORRFW/CMakeLists.txt
index 524e502fdad27c97ced505dfb24ec6b96502a067..981317f87838eab5cb7108a2b3adc12a50c9d595 100644 (file)
--- a/CORRFW/CMakeLists.txt
+++ b/CORRFW/CMakeLists.txt
@@ -1,10 +1,94 @@
-# AliRoot Build System CMakeLists for CORRFW
-#
-# Author: Johny Jose m(johny.jose@cern.ch)
-#         Port of previous Makefile build to cmake
+# **************************************************************************
+# * 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.                  *
+# **************************************************************************
 
-cmake_minimum_required(VERSION 2.8.8 FATAL_ERROR)
+# Module
+set(MODULE CORRFW)
 
-file(GLOB PACKAGES CMake*.pkg)
+# Module include folder
+include_directories(${CMAKE_SOURCE_DIR}/${MODULE})
 
-ALICE_BuildModule()
+# Additional include folders in alphabetical order except ROOT
+include_directories(${ROOT_INCLUDE_DIRS}
+                    ${CMAKE_SOURCE_DIR}/ANALYSIS/ANALYSISalice
+                    ${CMAKE_SOURCE_DIR}/STEER/AOD
+                    ${CMAKE_SOURCE_DIR}/STEER/ESD
+                    ${CMAKE_SOURCE_DIR}/STEER/STEERBase
+                   )
+
+# Sources in alphabetical order
+set(SRCS
+    AliCFAcceptanceCuts.cxx
+    AliCFContainer.cxx
+    AliCFCutBase.cxx
+    AliCFDataGrid.cxx
+    AliCFEffGrid.cxx
+    AliCFEventClassCuts.cxx
+    AliCFEventGenCuts.cxx
+    AliCFEventRecCuts.cxx
+    AliCFFrame.cxx
+    AliCFGridSparse.cxx
+    AliCFManager.cxx
+    AliCFPairAcceptanceCuts.cxx
+    AliCFPair.cxx
+    AliCFPairIsPrimaryCuts.cxx
+    AliCFPairPidCut.cxx
+    AliCFPairQualityCuts.cxx
+    AliCFParticleGenCuts.cxx
+    AliCFTrackCutPid.cxx
+    AliCFTrackIsPrimaryCuts.cxx
+    AliCFTrackKineCuts.cxx
+    AliCFTrackQualityCuts.cxx
+    AliCFUnfolding.cxx
+    AliCFV0TopoCuts.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}")
+
+# Generate the ROOT map
+# Dependecies
+set(LIBDEPS STEERBase AOD ESD ANALYSISalice Foam)
+generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE}LinkDef.h")
+
+# Add a library to the project using the specified source files
+add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx)
+
+# Additional compilation flags
+set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g")
+
+if(ROOT_HASALIEN STREQUAL "yes")
+    add_definitions(-DWITHALIEN)
+endif()
+
+if(ROOT_HASXML STREQUAL "yes")
+    add_definitions(-DWITHXML)
+endif()
+
+# 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/CORRFW/CMakelibCORRFW.pkg b/CORRFW/CMakelibCORRFW.pkg
deleted file mode 100644 (file)
index 2dd118e..0000000
--- a/CORRFW/CMakelibCORRFW.pkg
+++ /dev/null
@@ -1,74 +0,0 @@
-# -*- mode: CMake -*- 
-#--------------------------------------------------------------------------------#
-# Package File for CORRFW                                                        #
-# 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  
-    AliCFFrame.cxx 
-    AliCFGridSparse.cxx 
-    AliCFEffGrid.cxx 
-    AliCFDataGrid.cxx 
-    AliCFContainer.cxx 
-    AliCFManager.cxx 
-    AliCFCutBase.cxx 
-    AliCFEventClassCuts.cxx 
-    AliCFEventGenCuts.cxx 
-    AliCFEventRecCuts.cxx 
-    AliCFParticleGenCuts.cxx 
-    AliCFAcceptanceCuts.cxx 
-    AliCFTrackKineCuts.cxx 
-    AliCFTrackQualityCuts.cxx 
-    AliCFTrackIsPrimaryCuts.cxx 
-    AliCFTrackCutPid.cxx 
-    AliCFPair.cxx 
-    AliCFPairAcceptanceCuts.cxx 
-    AliCFPairQualityCuts.cxx 
-    AliCFPairIsPrimaryCuts.cxx 
-    AliCFPairPidCut.cxx 
-    AliCFV0TopoCuts.cxx 
-    AliCFUnfolding.cxx 
-    )
-
-if( ROOTHASALIEN STREQUAL "yes")
-       
-       set ( PACKCXXFLAGS  "${CXXFLAGS} -DWITHALIEN")
-
-endif( ROOTHASALIEN STREQUAL "yes")
-
-if( ROOTHASXML STREQUAL "yes")
-       
-       set ( PACKCXXFLAGS "${PACKCXXFLAGS}  ${CXXFLAGS} -DWITHXML")
-       set ( CINTFLAGS ${CINTFLAGS}  -DWITHXML)
-
-endif( ROOTHASXML STREQUAL "yes")
-
-string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )
-
-set ( DHDR  CORRFWLinkDef.h)
-
-string ( REPLACE ".cxx" ".h" EXPORT "${SRCS}" )
-
-set ( EINCLUDE  ANALYSIS STEER/AOD STEER/ESD STEER/STEERBase )