X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=blobdiff_plain;f=CMakeLists.txt;h=9d82f37a8a69ac23e5b55beecc23c3af67d0faeb;hp=85189bf8c9c9a1f038308afbaf97968f716080f7;hb=4d6033487210670dddc1934018b0574e51ead99d;hpb=f7d3fd753a20bfdb9771a6405a0c41b3e64309ef diff --git a/CMakeLists.txt b/CMakeLists.txt index 85189bf8c9c..9d82f37a8a6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -70,13 +70,23 @@ SET(ALIROOT_LIBRARY_PROPERTIES ${ALIROOT_LIBRARY_PROPERTIES} ) # Set version variables -Execute_process(COMMAND svn info $ENV{ALICE_ROOT} - OUTPUT_VARIABLE _svn_out) +Find_program( READLINK_PROGRAM readlink) + +If(READLINK_PROGRAM) + Execute_process(COMMAND readlink -f ${ALICE_ROOT} + COMMAND xargs svn info + OUTPUT_VARIABLE _svn_out) +Else(READLINK_PROGRAM) + Execute_process(COMMAND svn info ${ALICE_ROOT} + OUTPUT_VARIABLE _svn_out) +Endif(READLINK_PROGRAM) String(REGEX REPLACE "^.*Revision: ([^\n]*).*$" "\\1" ALIROOT_SVN_REVISION ${_svn_out}) String(REGEX REPLACE "^.*URL: https://alisoft.cern.ch/AliRoot/([^\n]*).*$" "w \\1" ALIROOT_SVN_BRANCH ${_svn_out}) +String(REPLACE "/" "\\\\/" + ALIROOT_SVN_BRANCH ${ALIROOT_SVN_BRANCH}) # Additional targets Add_Custom_Target(check-all COMMENT "Checking coding conventions") @@ -111,12 +121,12 @@ Add_subdirectory(BCM) Add_subdirectory(CORRFW) Add_subdirectory(DPMJET) Add_subdirectory(EMCAL) +Add_subdirectory(EPOS) Add_subdirectory(ESDCheck) Add_subdirectory(EVE) Add_subdirectory(EVGEN) Add_subdirectory(FASTSIM) Add_subdirectory(FMD) -Add_subdirectory(HBTAN) Add_subdirectory(HERWIG) Add_subdirectory(HIJING) Add_subdirectory(HLT) @@ -147,12 +157,13 @@ Add_subdirectory(TEPEMGEN) Add_subdirectory(THbtp) Add_subdirectory(THerwig) Add_subdirectory(THijing) -Add_subdirectory(TIsajet) +#Add_subdirectory(TIsajet) Add_subdirectory(TOF) Add_subdirectory(TPC) Add_subdirectory(TPHIC) Add_subdirectory(TRD) Add_subdirectory(TTherminator) +Add_subdirectory(TUHKMgen) Add_subdirectory(VZERO) Add_subdirectory(ZDC)