Cleaned up output of Cmake files and fixes to .pkg files

diff --git a/PWG0/CMakelibPWG0dep.pkg b/PWG0/CMakelibPWG0dep.pkg
index 9b3a99f1fa09dd2d40bcda3213fd39cd5f521199..d74f44dea6fe482ca8ea834659a898c7d1dc6344 100644 (file)
--- a/PWG0/CMakelibPWG0dep.pkg
+++ b/PWG0/CMakelibPWG0dep.pkg
@@ -25,7 +25,7 @@
 # SHLIBS - Shared Libraries and objects for linking (Executables only)           #
 #--------------------------------------------------------------------------------#
 
-set ( SRCS  dNdPt/AlidNdPtHelper.cxx dNdPt/AlidNdPtAnalysis.cxx dNdPt/AlidNdPtCorrection.cxx dNdPt/AlidNdPtAcceptanceCuts.cxx dNdPt/AlidNdPtEventCuts.cxx dNdPt/AlidNdPt.cxx dNdPt/AlidNdPtCutAnalysis.cxx dNdPt/AlidNdPtTask.cxx dNdPt/AlidNdPtBackgroundCuts.cxx)
+set ( SRCS  dNdPt/AlidNdPtHelper.cxx dNdPt/AlidNdPtAnalysis.cxx dNdPt/AlidNdPtAnalysisPbPb.cxx dNdPt/AlidNdPtCorrection.cxx dNdPt/AlidNdPtAcceptanceCuts.cxx dNdPt/AlidNdPtEventCuts.cxx dNdPt/AlidNdPt.cxx dNdPt/AlidNdPtCutAnalysis.cxx dNdPt/AlidNdPtTask.cxx dNdPt/AlidNdPtBackgroundCuts.cxx)
 
 string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )
 

diff --git a/PWG1/CMakelibPWG1.pkg b/PWG1/CMakelibPWG1.pkg
index 86fe5eeab8e5d795dbc738212790607e75e4fcf2..6c2d219fe16237e9efcb19f2cd9ed5ab225b0d05 100644 (file)
--- a/PWG1/CMakelibPWG1.pkg
+++ b/PWG1/CMakelibPWG1.pkg
@@ -29,14 +29,15 @@ file (GLOB SRCS1 "*.cxx" )
 file (GLOB SRCS2 "global/*.cxx" )
 file (GLOB SRCS3 "cosmic/*.cxx" )
 file (GLOB SRCS4 "tender/*.cxx" )
-file (GLOB SRCS5 "ITS/*.cxx" )
-file (GLOB SRCS6 "TRD/*.cxx" )
-file (GLOB SRCS7 "TPC/*.cxx" )
-file (GLOB SRCS8 "TOF/*.cxx" )
-file (GLOB SRCS9 "TRD/info/*.cxx" )
-file (GLOB SRCS10 "background/*.cxx" )
+file (GLOB SRCS5 "HMPID/*.cxx" )
+file (GLOB SRCS6 "ITS/*.cxx" )
+file (GLOB SRCS7 "TRD/*.cxx" )
+file (GLOB SRCS8 "TPC/*.cxx" )
+file (GLOB SRCS9 "TOF/*.cxx" )
+file (GLOB SRCS10 "TRD/info/*.cxx" )
+file (GLOB SRCS11 "background/*.cxx" )
 
-list(APPEND SRCS ${SRCS1} ${SRCS2} ${SRCS3} ${SRCS4} ${SRCS5} ${SRCS6} ${SRCS7} ${SRCS8} ${SRCS9} ${SRCS10})
+list(APPEND SRCS ${SRCS1} ${SRCS2} ${SRCS3} ${SRCS4} ${SRCS5} ${SRCS6} ${SRCS7} ${SRCS8} ${SRCS9} ${SRCS10} ${SRCS11})
 
 string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )
 

diff --git a/cmake/CMakeDA.cmake b/cmake/CMakeDA.cmake
index 3350ef13de05a43e0a3a0623616ed64be24dc5cf..33b96ba4400ed39b715d43c58f3b159576fdec6d 100644 (file)
--- a/cmake/CMakeDA.cmake
+++ b/cmake/CMakeDA.cmake
@@ -118,9 +118,6 @@ foreach(detector ${ONLINEDETECTORS} )
   expand(DAINCDIRS "\${${DAMODULE}INC}")
   list(APPEND ALIROOTALIBS ${ALIROOTALIBS2})
   
-  message("Listing sub directories for ${DAMODULE}")
-  message("${DAINCDIRS}")
-  
   include_directories(${DAMODULE} ${SUBDIR} ${DAINCDIRS})
 #Get detector algorithms for this detector
 
@@ -191,7 +188,6 @@ foreach(detector ${ONLINEDETECTORS} )
          set(CMAKE_MODULE_LINKER_FLAGS ${LDFLAGS})
 
          set(ZIP)
-         message("${DAEXE}- ${DAMODULE} - ${ALIROOTALIBS}")
          foreach(_lib ${ALIROOTALIBS})
           string(REGEX REPLACE "-all" "_a" _lib ${_lib})
           list(APPEND ZIP && ar x "../lib${_lib}.a")