Text archives Help

---

Author: bigler
Date: Tue Dec  4 22:39:43 2007
New Revision: 1906

Modified:
   trunk/CMake/ConfigureAbout.cmake.CMakeTemplate
Log:
CMake/ConfigureAbout.cmake.CMakeTemplate

  Find svn before using it.  If it isn't found, use a dummy string for
  the ABOUT_STRING.


Modified: trunk/CMake/ConfigureAbout.cmake.CMakeTemplate
==============================================================================
--- trunk/CMake/ConfigureAbout.cmake.CMakeTemplate      (original)
+++ trunk/CMake/ConfigureAbout.cmake.CMakeTemplate      Tue Dec  4 22:39:43 
2007
@@ -4,19 +4,27 @@
 
 
 # Execute svn status.
-MESSAGE( STATUS "Executing: svn info " @CMAKE_SOURCE_DIR@ )
-EXEC_PROGRAM(svn ARGS info @CMAKE_SOURCE_DIR@
-                 OUTPUT_VARIABLE SVN_OUTPUT )
+MESSAGE( STATUS "Locating svn")
+FIND_PROGRAM(Subversion_SVN_EXECUTABLE svn
+  DOC "subversion command line client")
 
-# Replace newlines with escape sequence.
-STRING(REGEX REPLACE "\n" "\\\\n" SVN_OUTPUT ${SVN_OUTPUT})
+IF(Subversion_SVN_EXECUTABLE)
+  MESSAGE( STATUS "Executing: svn info " @CMAKE_SOURCE_DIR@ )
+  EXEC_PROGRAM(${Subversion_SVN_EXECUTABLE} ARGS info @CMAKE_SOURCE_DIR@
+    OUTPUT_VARIABLE SVN_OUTPUT )
 
-# Set the about string.
-SET(ABOUT_STRING ${SVN_OUTPUT} 
-  "\\n\\n"
-  "Build Type: " @CMAKE_BUILD_TYPE@ "\\n"
-  "Compiler:   " @CMAKE_CXX_COMPILER@ "\\n"
-  )
+  # Replace newlines with escape sequence.
+  STRING(REGEX REPLACE "\n" "\\\\n" SVN_OUTPUT ${SVN_OUTPUT})
+
+  # Set the about string.
+  SET(ABOUT_STRING ${SVN_OUTPUT} 
+    "\\n\\n"
+    "Build Type: " @CMAKE_BUILD_TYPE@ "\\n"
+    "Compiler:   " @CMAKE_CXX_COMPILER@ "\\n"
+    )
+ELSE(Subversion_SVN_EXECUTABLE)
+  SET(ABOUT_STRING "svn command not found: svn info unavailable\\\n")
+ENDIF(Subversion_SVN_EXECUTABLE)
 
 SET(CMAKE_BACKWARDS_COMPATIBILITY 2.4)
 

---

• [Manta] r1906 - trunk/CMake, bigler, 12/05/2007

---

Archive powered by MHonArc 2.6.16.