Converting PWG/FLOW/Base to the native cmake

diff --git a/PWG/CMakeLists.txt b/PWG/CMakeLists.txt
index cd17729240740bfb576afbb848414fb11262536d..1af811cdaccfaf7a08f9c6f4543b2ad9c2ab768e 100644 (file)
--- a/PWG/CMakeLists.txt
+++ b/PWG/CMakeLists.txt
@@ -16,5 +16,6 @@
 # Include the libraries
 add_subdirectory (Tools)
 add_subdirectory (Glauber)
+add_subdirectory (FLOW)
 
 message(STATUS "PWG enabled")

diff --git a/PWG/CMakelibPWGflowBase.pkg b/PWG/CMakelibPWGflowBase.pkg
deleted file mode 100644 (file)
index 0d3c0e4..0000000
--- a/PWG/CMakelibPWGflowBase.pkg
+++ /dev/null
@@ -1,75 +0,0 @@
-#--------------------------------------------------------------------------------#
-# Package File for PWGflowBase                                                   #
-# Author : Mikolaj Krzewicki (mikolaj.krzewicki@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 
-      FLOW/Base/AliFlowEventSimple.cxx 
-      FLOW/Base/AliFlowTrackSimple.cxx 
-      FLOW/Base/AliStarTrack.cxx 
-      FLOW/Base/AliStarEvent.cxx 
-      FLOW/Base/AliStarTrackCuts.cxx 
-      FLOW/Base/AliStarEventCuts.cxx 
-      FLOW/Base/AliFlowEventStar.cxx 
-      FLOW/Base/AliStarEventReader.cxx 
-      FLOW/Base/AliFlowTrackSimpleCuts.cxx 
-      FLOW/Base/AliFlowEventSimpleCuts.cxx
-      FLOW/Base/AliFlowVector.cxx 
-      FLOW/Base/AliFlowCommonConstants.cxx 
-      FLOW/Base/AliFlowLYZConstants.cxx 
-      FLOW/Base/AliFlowEventSimpleMakerOnTheFly.cxx 
-      FLOW/Base/AliFlowCommonHist.cxx 
-      FLOW/Base/AliFlowCommonHistResults.cxx 
-      FLOW/Base/AliFlowLYZHist1.cxx 
-      FLOW/Base/AliFlowLYZHist2.cxx 
-      FLOW/Base/AliFlowLYZEventPlane.cxx 
-      FLOW/Base/AliFlowAnalysis.cxx 
-      FLOW/Base/AliFlowAnalysisWithScalarProduct.cxx 
-      FLOW/Base/AliFlowAnalysisWithMCEventPlane.cxx 
-      FLOW/Base/AliFlowAnalysisWithLYZEventPlane.cxx 
-      FLOW/Base/AliFlowAnalysisWithLeeYangZeros.cxx 
-      FLOW/Base/AliFlowAnalysisWithCumulants.cxx 
-      FLOW/Base/AliFlowAnalysisWithQCumulants.cxx 
-      FLOW/Base/AliFlowAnalysisWithFittingQDistribution.cxx 
-      FLOW/Base/AliFlowAnalysisWithMixedHarmonics.cxx 
-      FLOW/Base/AliFlowAnalysisWithNestedLoops.cxx
-      FLOW/Base/AliFlowOnTheFlyEventGenerator.cxx
-      FLOW/Base/AliFlowAnalysisWithMultiparticleCorrelations.cxx
-)
-
-string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )
-
-set ( DHDR PWGflowBaseLinkDef.h)
-
-set ( EXPORT ${HDRS} )
-
-set ( EINCLUDE  PWG/FLOW/Base)
-
-if( ALICE_TARGET STREQUAL "win32gcc")
-       
-       set ( PACKSOFLAGS  ${SOFLAGS} -L${ROOTLIBDIR} -lEG)
-       set ( ELIBS ${ROOTCLIBS} -lEG)
-
-endif( ALICE_TARGET STREQUAL "win32gcc")

diff --git a/PWG/FLOW/Base/CMakeLists.txt b/PWG/FLOW/Base/CMakeLists.txt
new file mode 100644 (file)
index 0000000..0fd5e68
--- /dev/null
+++ b/PWG/FLOW/Base/CMakeLists.txt
@@ -0,0 +1,93 @@
+# **************************************************************************
+# * 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 PWGflowBase)
+
+# Module include folder
+include_directories(${AliRoot_SOURCE_DIR}/PWG/FLOW/Base)
+
+# Additional includes - alphabetical order except ROOT
+include_directories(${ROOT_INCLUDE_DIRS}
+#                    ${AliRoot_SOURCE_DIR}/ANALYSIS/ANALYSIS
+  )
+
+# Sources - alphabetical order
+set(SRCS
+  AliFlowEventSimple.cxx 
+  AliFlowTrackSimple.cxx 
+  AliStarTrack.cxx 
+  AliStarEvent.cxx 
+  AliStarTrackCuts.cxx 
+  AliStarEventCuts.cxx 
+  AliFlowEventStar.cxx 
+  AliStarEventReader.cxx 
+  AliFlowTrackSimpleCuts.cxx 
+  AliFlowEventSimpleCuts.cxx
+  AliFlowVector.cxx 
+  AliFlowCommonConstants.cxx 
+  AliFlowLYZConstants.cxx 
+  AliFlowEventSimpleMakerOnTheFly.cxx 
+  AliFlowCommonHist.cxx 
+  AliFlowCommonHistResults.cxx 
+  AliFlowLYZHist1.cxx 
+  AliFlowLYZHist2.cxx 
+  AliFlowLYZEventPlane.cxx 
+  AliFlowAnalysis.cxx 
+  AliFlowAnalysisWithScalarProduct.cxx 
+  AliFlowAnalysisWithMCEventPlane.cxx 
+  AliFlowAnalysisWithLYZEventPlane.cxx 
+  AliFlowAnalysisWithLeeYangZeros.cxx 
+  AliFlowAnalysisWithCumulants.cxx 
+  AliFlowAnalysisWithQCumulants.cxx 
+  AliFlowAnalysisWithFittingQDistribution.cxx 
+  AliFlowAnalysisWithMixedHarmonics.cxx 
+  AliFlowAnalysisWithNestedLoops.cxx
+  AliFlowOnTheFlyEventGenerator.cxx
+  AliFlowAnalysisWithMultiparticleCorrelations.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 EG Physics Hist MathCore RIO Core)
+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/PWGflowBaseLinkDef.h b/PWG/FLOW/Base/PWGflowBaseLinkDef.h
similarity index 100%
rename from PWG/PWGflowBaseLinkDef.h
rename to PWG/FLOW/Base/PWGflowBaseLinkDef.h

diff --git a/PWG/FLOW/CMakeLists.txt b/PWG/FLOW/CMakeLists.txt
new file mode 100644 (file)
index 0000000..4a1a7b7
--- /dev/null
+++ b/PWG/FLOW/CMakeLists.txt
@@ -0,0 +1,17 @@
+# **************************************************************************
+# * 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.                  *
+# **************************************************************************
+
+# Include the libraries
+add_subdirectory (Base)