[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24123] trunk/blender/CMakeLists.txt: CMake: attempt to make build not fail in case "svnversion" command is not found.

Brecht Van Lommel brecht at blender.org
Tue Oct 27 20:32:22 CET 2009


Revision: 24123
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24123
Author:   blendix
Date:     2009-10-27 20:32:22 +0100 (Tue, 27 Oct 2009)

Log Message:
-----------
CMake: attempt to make build not fail in case "svnversion" command is not found.

Modified Paths:
--------------
    trunk/blender/CMakeLists.txt

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2009-10-27 18:50:26 UTC (rev 24122)
+++ trunk/blender/CMakeLists.txt	2009-10-27 19:32:22 UTC (rev 24123)
@@ -540,13 +540,19 @@
 	IF(UNIX)
 		EXEC_PROGRAM("date \"+%Y-%m-%d\"" OUTPUT_VARIABLE BUILD_DATE)
 		EXEC_PROGRAM("date \"+%H:%M:%S\"" OUTPUT_VARIABLE BUILD_TIME)  
-		EXEC_PROGRAM("svnversion ${CMAKE_SOURCE_DIR}" OUTPUT_VARIABLE BUILD_REV)
+		EXEC_PROGRAM("svnversion ${CMAKE_SOURCE_DIR}" OUTPUT_VARIABLE BUILD_REV RETURN_VALUE BUILD_REV_RETURN)
+		IF(BUILD_REV_RETURN)
+			SET(BUILD_REV "unknown")
+		ENDIF(BUILD_REV_RETURN)
 	ENDIF(UNIX)
 	
 	IF(WIN32)
 		EXEC_PROGRAM("cmd /c date /t" OUTPUT_VARIABLE BUILD_DATE)
 		EXEC_PROGRAM("cmd /c time /t" OUTPUT_VARIABLE BUILD_TIME)  
-		EXEC_PROGRAM("svnversion ${CMAKE_SOURCE_DIR}" OUTPUT_VARIABLE BUILD_REV)
+		EXEC_PROGRAM("svnversion ${CMAKE_SOURCE_DIR}" OUTPUT_VARIABLE BUILD_REV RETURN_VALUE BUILD_REV_RETURN)
+		IF(BUILD_REV_RETURN)
+			SET(BUILD_REV "unknown")
+		ENDIF(BUILD_REV_RETURN)
 	ENDIF(WIN32)
 ENDIF(WITH_BUILDINFO)
 	





More information about the Bf-blender-cvs mailing list