add initial version of the friend interface classes

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

diff --git a/cmake/CMakeDA.cmake b/cmake/CMakeDA.cmake
index 8ced6a1ffd6993abbb791e7638558bc9421b9378..f2d14b66d1c1e3afe7c83d358b254251aa686ba0 100644 (file)
--- a/cmake/CMakeDA.cmake
+++ b/cmake/CMakeDA.cmake
@@ -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-------------------
 
@@ -194,16 +194,18 @@ foreach(detector ${ONLINEDETECTORS} )
        # 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} 
+       execute_process(COMMAND git log -1 --format=%h ${DASRC} 
+         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+         OUTPUT_STRIP_TRAILING_WHITESPACE
          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)
+       execute_process(COMMAND git log -1 --format=%h ${DASRC}
+         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+         OUTPUT_STRIP_TRAILING_WHITESPACE
+         OUTPUT_VARIABLE DAREVISION)
 
        # DAROOTRELEASE 
          execute_process(COMMAND root-config --version OUTPUT_VARIABLE _darootrelease OUTPUT_STRIP_TRAILING_WHITESPACE)
@@ -213,8 +215,9 @@ foreach(detector ${ONLINEDETECTORS} )
        # 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)
+         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+         OUTPUT_STRIP_TRAILING_WHITESPACE
+         OUTPUT_VARIABLE DAALIROOTRELEASE)
         string (REPLACE "* " "" DAALIROOTRELEASE "${DAALIROOTRELEASE}")
        
          set(DAARCNAME "${DATARGETNAME}")
@@ -471,7 +474,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}
 )