FindFASTJET

[u/mrichter/AliRoot.git] / cmake / CMakeDA.cmake

diff --git a/cmake/CMakeDA.cmake b/cmake/CMakeDA.cmake
index 8ced6a1ffd6993abbb791e7638558bc9421b9378..8239b22c837f9cf45b6251f39ed5b4425b1ebc97 100644 (file)
--- a/cmake/CMakeDA.cmake
+++ b/cmake/CMakeDA.cmake
@@ -5,7 +5,7 @@
 #         Port of previous Makefile build to DAQ targets and RPM
 #
 
-cmake_minimum_required(VERSION 2.8.4 FATAL_ERROR)
+cmake_minimum_required(VERSION 2.8.8 FATAL_ERROR)
 
 # -----------Utilities--------------------
 
@@ -68,7 +68,7 @@ foreach(oldetect ${ONLINEDETECTORS})
 detector_module(h_module ${oldetect})
   list(APPEND mod "-I${CMAKE_SOURCE_DIR}/${h_module}")
 endforeach(oldetect ${ONLINEDETECTORS})
-list(APPEND mod "-I${CMAKE_SOURCE_DIR}/include" "-I${CMAKE_SOURCE_DIR}/STEER" "-I${CMAKE_SOURCE_DIR}/ANALYSIS" "-I${CMAKE_SOURCE_DIR}/RAW" "-I${CMAKE_SOURCE_DIR}/STEER/STEER" "-I${CMAKE_SOURCE_DIR}/STEER/CDB" "-I${ROOTINCDIR}" "-I${CMAKE_SOURCE_DIR}/STEER/STEERBase" "-I${CMAKE_SOURCE_DIR}/STEER/AOD" "-I${CMAKE_SOURCE_DIR}/STEER/ESD" "-I${CMAKE_SOURCE_DIR}/MUON/mapping" "-I$ENV{AMORE}/include/amore")
+list(APPEND mod "-I${CMAKE_SOURCE_DIR}/include" "-I${CMAKE_SOURCE_DIR}/STEER" "-I${CMAKE_SOURCE_DIR}/ANALYSIS" "-I${CMAKE_SOURCE_DIR}/RAW" "-I${CMAKE_SOURCE_DIR}/STEER/STEER" "-I${CMAKE_SOURCE_DIR}/STEER/CDB" "-I${ROOTINCDIR}" "-I${CMAKE_SOURCE_DIR}/STEER/STEERBase" "-I${CMAKE_SOURCE_DIR}/STEER/AOD" "-I${CMAKE_SOURCE_DIR}/STEER/ESD" "-I${CMAKE_SOURCE_DIR}/MUON/mapping" "-I${CMAKE_SOURCE_DIR}/TPC/Base" "-I$ENV{AMORE}/include/amore")
 
 # ----------Common stuff-------------------
 
@@ -191,35 +191,15 @@ foreach(detector ${ONLINEDETECTORS} )
        set(DAEXE "${DAMODULE}${SUBDAMODULE}${DANAME}da.exe")
        set(DADEP "${DATARGETDIR}/${DAMODULE}${SUBDAMODULE}${DANAME}da.d") 
 
-       # DAVERSION
-       # execute_process(COMMAND svn info ${CMAKE_SOURCE_DIR}/${DASRC} OUTPUT_VARIABLE _daversion OUTPUT_STRIP_TRAILING_WHITESPACE)
-       # string(REGEX REPLACE ".*Last Changed Rev: ([^\n]+)\n.*" "\\1" DAVERSION ${_daversion}e)
-       execute_process(COMMAND git log -1 --format=%h 
-         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/${DASRC} 
-         OUTPUT_VARIABLE DAVERSION)
-
-       #DAREVISION
-       # execute_process(COMMAND svn info ${CMAKE_SOURCE_DIR} OUTPUT_VARIABLE _darevision OUTPUT_STRIP_TRAILING_WHITESPACE)
-        # string(REGEX REPLACE ".*Revision: ([^\n]+)\n.*" "\\1" DAREVISION ${_darevision})
-       execute_process(COMMAND git log -1 --format=%h 
-         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/${DASRC} 
-         OUTPUT_VARIABLE DAVERSION)
-
        # DAROOTRELEASE 
          execute_process(COMMAND root-config --version OUTPUT_VARIABLE _darootrelease OUTPUT_STRIP_TRAILING_WHITESPACE)
          string(REGEX REPLACE "/" "." DAROOTRELEASE ${_darootrelease})
        
-       # DAALIROOTRELEASE
-       # string(REGEX REPLACE ".*URL: .*/(.+)/${DASRC}.*$" "\\1" DAALIROOTRELEASE ${_daversion})
-        # string (REPLACE "-" "." DAALIROOTRELEASE "${DAALIROOTRELEASE}")
-       execute_process(COMMAND git branch
-         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/${DASRC} 
-         OUTPUT_VARIABLE DAVERSION)
-        string (REPLACE "* " "" DAALIROOTRELEASE "${DAALIROOTRELEASE}")
+      set(DAALIROOTRELEASE ${ALIROOT_BRANCH})
        
          set(DAARCNAME "${DATARGETNAME}")
          #string(REPLACE "-" "" DAARCNAME "${DAARCNAME}")
-         set(DAARC "${DAARCNAME}-${DAVERSION}")
+         set(DAARC "${DAARCNAME}-${ALIROOT_BRANCH_SPEC}")
          set(DATAR "${DATARGETDIR}/${DAARC}.src.tar.gz")
          set(DASPECFILE "${DATARGETDIR}/${DAMODULE}${SUBDAMODULE}${DANAME}da.spec")
          set(DAMAKEFILE "${DATARGETDIR}/${DAMODULE}${SUBDAMODULE}${DANAME}da.make")
@@ -364,8 +344,8 @@ COMMAND @echo "***** Making RPM spec-file ${DASPECFILE} *****"
 COMMAND @echo '\# RPM specfile for $(DAMODULE)${SUBDAMODULE}$(DANAME) Detector Algorithm' >> ${DASPECFILE}
 COMMAND @echo "Summary: ${ONLINEDETECTORNAME} Detector Algorithm" >> ${DASPECFILE}
 COMMAND @echo "Name: ${DAARCNAME}" >> ${DASPECFILE}
-COMMAND @echo "Version: ${DAVERSION}" >> ${DASPECFILE}
-COMMAND @echo "Release: ${DAALIROOTRELEASE}.${DAREVISION}" >> ${DASPECFILE}
+COMMAND @echo "Version: ${ALIROOT_BRANCH_SPEC}" >> ${DASPECFILE}
+COMMAND @echo "Release: ${GIT_SHORT_SHA1}" >> ${DASPECFILE}
 COMMAND @echo "License: CERN Alice DAQ/Offine" >> ${DASPECFILE}
 COMMAND @echo "Source: %{name}-%{version}.src.tar.gz" >> ${DASPECFILE}
 COMMAND @echo "Group: Applications/Alice" >> ${DASPECFILE}
@@ -379,7 +359,7 @@ COMMAND @echo '\# list here required RPM packages for compilation' >> ${DASPECFI
 COMMAND @echo "BuildRequires: date" >> ${DASPECFILE} 
 COMMAND @echo "" >> ${DASPECFILE}
 COMMAND @echo '\# list here required RPM packages for runtime' >> ${DASPECFILE}
-COMMAND @echo "Requires: date" >> ${DASPECFILE}
+COMMAND @echo "Requires: date, daqDA-lib" >> ${DASPECFILE}
 COMMAND @echo "" >> ${DASPECFILE}    
 COMMAND @echo '\# You can specify other dependencies in the description tag below.' >> ${DASPECFILE}
 COMMAND @echo "" >> ${DASPECFILE}
@@ -471,7 +451,7 @@ WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
 
 add_custom_target(${DAEXE}
 COMMAND echo "***** Making executable ${DAEXE} *****"
-COMMAND g++ ${LDFLAGS} ${DAOBJ} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/lib${DALIB}.a ${EXTRAROOTLIB} ${ROOTSYS}/lib/libRoot.a ${ROOTSYS}/lib/liblzma.a ${ROOTSYS}/lib/libfreetype.a ${ROOTSYS}/lib/libpcre.a  ${SYSLIBS} ${DAQDALIB} ${AMOREDALIBS} ${MONITORLIBS} -o ${DAEXE}
+COMMAND g++ ${LDFLAGS} ${DAOBJ} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/lib${DALIB}.a ${EXTRAROOTLIB} $ENV{ROOTSYS}/lib/libRoot.a $ENV{ROOTSYS}/lib/liblzma.a $ENV{ROOTSYS}/lib/libfreetype.a $ENV{ROOTSYS}/lib/libpcre.a  ${SYSLIBS} ${DAQDALIB} ${AMOREDALIBS} ${MONITORLIBS} -o ${DAEXE}
 WORKING_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
 )