]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - CMakeLists.txt
Modified macros for TOF analysis of K* in pA for possibility to use daughter's pt...
[u/mrichter/AliRoot.git] / CMakeLists.txt
index 1eac6237005b6158c86dc814e6b11dd8da55e5e7..8e766d424b8ac83c8e24c64c0dd6cbca1c6a33b2 100644 (file)
@@ -180,6 +180,7 @@ if(Subversion_FOUND)
   string(REGEX MATCH "[^/]+$" ALIROOT_SVN_BRANCH ${ALIROOT_SVN_BRANCH})
 
   elseif(EXISTS ${PROJECT_SOURCE_DIR}/.git/ )
+    if(EXISTS ${PROJECT_SOURCE_DIR}/.git/svn/refs )
     execute_process(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND git svn info OUTPUT_VARIABLE OUTPUTVAR)
     string(REPLACE "\n" ";" OUTPUTVAR ${OUTPUTVAR})
     foreach(f ${OUTPUTVAR})
@@ -189,6 +190,20 @@ if(Subversion_FOUND)
        string(REGEX MATCH "[^: ]+$" ALIROOT_SVN_REVISION ${f})
       endif(${f} MATCHES URL)   
     endforeach()
+    else()
+      execute_process(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND git log -1 OUTPUT_VARIABLE OUTPUTVAR)
+      string(REPLACE "\n" ";" OUTPUTVAR ${OUTPUTVAR})
+      foreach(f ${OUTPUTVAR})
+        if(${f} MATCHES "^[ ]*git-svn-id:")
+          string(REGEX REPLACE "^.*/(.*)[@].*$" "\\1" ALIROOT_SVN_BRANCH "${f}" )
+          string(REGEX REPLACE "^.*/.*[@](.*) .*$" "\\1" ALIROOT_SVN_REVISION "${f}" )
+        endif(${f} MATCHES "^[ ]*git-svn-id:")
+      endforeach()
+      if(${ALIROOT_SVN_BRANCH}x STREQUAL "x")
+        set(ALIROOT_SVN_BRANCH "git clone")
+        set(ALIROOT_SVN_REVISION "-1")
+      endif(${ALIROOT_SVN_BRANCH}x STREQUAL "x")
+    endif(EXISTS ${PROJECT_SOURCE_DIR}/.git/svn/refs )
   endif(EXISTS ${PROJECT_SOURCE_DIR}/.svn/ )
 
   message(STATUS "Aliroot Revision - ${ALIROOT_SVN_REVISION} Branch - ${ALIROOT_SVN_BRANCH}")