Print override: changed fot TObjArray in root v5-22-00. Now adapted.

[u/mrichter/AliRoot.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 942e2c7ea9ebe83b40c7d0a38e3f70ea95e13a2f..210b959ddfeeeaf705e16ea0522d694a1326e206 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -70,14 +70,23 @@ SET(ALIROOT_LIBRARY_PROPERTIES ${ALIROOT_LIBRARY_PROPERTIES}
 )
 
 # Set version variables
-Execute_process(COMMAND readlink -f ${ALICE_ROOT} 
-  COMMAND xargs svn info
-  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")
@@ -117,7 +126,6 @@ Add_subdirectory(EVE)
 Add_subdirectory(EVGEN) 
 Add_subdirectory(FASTSIM) 
 Add_subdirectory(FMD)
-Add_subdirectory(HBTAN)
 Add_subdirectory(HERWIG) 
 Add_subdirectory(HIJING) 
 Add_subdirectory(HLT) 
@@ -148,7 +156,7 @@ 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)