Try getting SVN revision from Jenkins environment when using CMake (copy logic from...

diff --git a/CMakeLists.txt b/CMakeLists.txt
index aa1a0f0eb9323e8a4592815074d3c058f8304b3c..bd98df58b58d444f3e35f92ab5b8519182fd47f2 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,10 +60,16 @@ set(TR_SCM_REVISION_FILE "${CMAKE_SOURCE_DIR}/REVISION")
 set(TR_SCM_REVISION_RELIABLE ON)
 
 if(IS_DIRECTORY ${CMAKE_SOURCE_DIR}/.svn)
-    find_package(Subversion)
-    if(Subversion_FOUND)
-        Subversion_WC_INFO(${CMAKE_SOURCE_DIR} TR_SVN)
-        set(TR_SCM_REVISION "${TR_SVN_WC_REVISION}")
+    if(NOT "$ENV{JENKINS_URL}" STREQUAL "" AND NOT "$ENV{SVN_REVISION}" STREQUAL "")
+        # Jenkins automated build, use the set environment variables to avoid
+        # version mismatches between java's svn and command line's svn
+        set(TR_SCM_REVISION "$ENV{SVN_REVISION}")
+    else()
+        find_package(Subversion)
+        if(Subversion_FOUND)
+            Subversion_WC_INFO(${CMAKE_SOURCE_DIR} TR_SVN)
+            set(TR_SCM_REVISION "${TR_SVN_WC_REVISION}")
+        endif()
     endif()
 elseif(IS_DIRECTORY ${CMAKE_SOURCE_DIR}/.git)
     find_package(Git)