From 5ab973340e0bca38aa3180013106338a128bca2d Mon Sep 17 00:00:00 2001 From: hristov Date: Fri, 5 Dec 2014 22:14:30 +0100 Subject: [PATCH] PWGPPevchar converted to native cmake --- PWGPP/CMakeLists.txt | 1 + PWGPP/CMakelibPWGPPevchar.pkg | 43 ------------- PWGPP/EVCHAR/AliAnalysisTaskSPDdNdEta.cxx | 2 +- PWGPP/EVCHAR/AliTrackletAlg.cxx | 14 ++--- PWGPP/EVCHAR/CMakeLists.txt | 74 +++++++++++++++++++++++ PWGPP/{ => EVCHAR}/PWGPPevcharLinkDef.h | 0 6 files changed, 83 insertions(+), 51 deletions(-) delete mode 100644 PWGPP/CMakelibPWGPPevchar.pkg create mode 100644 PWGPP/EVCHAR/CMakeLists.txt rename PWGPP/{ => EVCHAR}/PWGPPevcharLinkDef.h (100%) diff --git a/PWGPP/CMakeLists.txt b/PWGPP/CMakeLists.txt index 4621b32faf5..925207023dc 100644 --- a/PWGPP/CMakeLists.txt +++ b/PWGPP/CMakeLists.txt @@ -15,6 +15,7 @@ # Libraries from subdirectories add_subdirectory(pid) +add_subdirectory(EVCHAR) #Module set (MODULE PWGPP) diff --git a/PWGPP/CMakelibPWGPPevchar.pkg b/PWGPP/CMakelibPWGPPevchar.pkg deleted file mode 100644 index 680e05dcae8..00000000000 --- a/PWGPP/CMakelibPWGPPevchar.pkg +++ /dev/null @@ -1,43 +0,0 @@ -# -*- mode: CMake -*- -#--------------------------------------------------------------------------------# -# Package File for PWGPPevchar # -# 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 - EVCHAR/AliAnalysisTaskSPDdNdEta.cxx - EVCHAR/AliTrackletAlg.cxx - EVCHAR/AliAnalysisTaskCentrality.cxx - EVCHAR/AliCentralityByFunction.cxx - EVCHAR/AliCentralityGlauberFit.cxx - ) - -string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" ) - -set ( DHDR PWGPPevcharLinkDef.h) - -set ( EXPORT ) - -set ( EINCLUDE PWGPP/EVCHAR STEER/STEER STEER/STEERBase ANALYSIS) diff --git a/PWGPP/EVCHAR/AliAnalysisTaskSPDdNdEta.cxx b/PWGPP/EVCHAR/AliAnalysisTaskSPDdNdEta.cxx index 6d029555831..73ebb2b3e42 100644 --- a/PWGPP/EVCHAR/AliAnalysisTaskSPDdNdEta.cxx +++ b/PWGPP/EVCHAR/AliAnalysisTaskSPDdNdEta.cxx @@ -38,7 +38,7 @@ #include "AliESDInputHandlerRP.h" #include "AliESDVZERO.h" -#include "../ITS/AliITSRecPoint.h" +#include "AliITSRecPoint.h" #include "AliCDBPath.h" #include "AliCDBManager.h" #include "AliCDBEntry.h" diff --git a/PWGPP/EVCHAR/AliTrackletAlg.cxx b/PWGPP/EVCHAR/AliTrackletAlg.cxx index 32d06a7c3c7..cc37167f6fc 100644 --- a/PWGPP/EVCHAR/AliTrackletAlg.cxx +++ b/PWGPP/EVCHAR/AliTrackletAlg.cxx @@ -33,13 +33,13 @@ #include #include "AliTrackletAlg.h" -#include "../ITS/AliITSReconstructor.h" -#include "../ITS/AliITSsegmentationSPD.h" -#include "../ITS/AliITSRecPoint.h" -#include "../ITS/AliITSRecPointContainer.h" -#include "../ITS/AliITSgeom.h" -#include "../ITS/AliITSgeomTGeo.h" -#include "../ITS/AliITSDetTypeRec.h" +#include "AliITSReconstructor.h" +#include "AliITSsegmentationSPD.h" +#include "AliITSRecPoint.h" +#include "AliITSRecPointContainer.h" +#include "AliITSgeom.h" +#include "AliITSgeomTGeo.h" +#include "AliITSDetTypeRec.h" #include "AliESDEvent.h" #include "AliESDVertex.h" #include "AliESDtrack.h" diff --git a/PWGPP/EVCHAR/CMakeLists.txt b/PWGPP/EVCHAR/CMakeLists.txt new file mode 100644 index 00000000000..d3473d31c46 --- /dev/null +++ b/PWGPP/EVCHAR/CMakeLists.txt @@ -0,0 +1,74 @@ +# ************************************************************************** +# * 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 PWGPPevchar) + +# Module include folder +include_directories(${AliRoot_SOURCE_DIR}/PWGPP/EVCHAR) + +# Additional includes - alphabetical order except ROOT +include_directories(${ROOT_INCLUDE_DIRS} + ${AliRoot_SOURCE_DIR}/ANALYSIS/ANALYSIS + ${AliRoot_SOURCE_DIR}/ANALYSIS/ANALYSISalice + ${AliRoot_SOURCE_DIR}/ITS/ITSbase + ${AliRoot_SOURCE_DIR}/STEER/AOD + ${AliRoot_SOURCE_DIR}/STEER/CDB + ${AliRoot_SOURCE_DIR}/STEER/ESD + ${AliRoot_SOURCE_DIR}/STEER/STEER + ${AliRoot_SOURCE_DIR}/STEER/STEERBase + ) + +# Sources - alphabetical order +set(SRCS + AliAnalysisTaskSPDdNdEta.cxx + AliTrackletAlg.cxx + AliAnalysisTaskCentrality.cxx + AliCentralityByFunction.cxx + AliCentralityGlauberFit.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 CDB ITSbase) +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/PWGPP/PWGPPevcharLinkDef.h b/PWGPP/EVCHAR/PWGPPevcharLinkDef.h similarity index 100% rename from PWGPP/PWGPPevcharLinkDef.h rename to PWGPP/EVCHAR/PWGPPevcharLinkDef.h -- 2.43.0