[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23457] trunk/blender: add buildinfo to cmake (no win32 support)

[Campbell Barton]

Revision: 23457
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23457
Author:   campbellbarton
Date:     2009-09-24 17:36:00 +0200 (Thu, 24 Sep 2009)

Log Message:
-----------
add buildinfo to cmake (no win32 support)

Modified Paths:
--------------
    trunk/blender/CMakeLists.txt
    trunk/blender/source/creator/CMakeLists.txt
    trunk/blender/source/creator/creator.c

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2009-09-24 14:39:14 UTC (rev 23456)
+++ trunk/blender/CMakeLists.txt	2009-09-24 15:36:00 UTC (rev 23457)
@@ -76,7 +76,7 @@
 OPTION(WITH_JACK          "Enable Jack Support (http://www.jackaudio.org)" OFF)
 OPTION(WITH_SNDFILE       "Enable libsndfile Support (http://www.mega-nerd.com/libsndfile)" OFF)
 OPTION(WITH_CXX_GUARDEDALLOC "Enable GuardedAlloc for C++ memory allocation" OFF)
-# OPTION(WITH_BUILDINFO     "Include extra build details" ON)
+OPTION(WITH_BUILDINFO     "Include extra build details" ON)
 OPTION(WITH_INSTALL       "Install accompanying scripts and language files needed to run blender" ON)
 
 IF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
@@ -517,15 +517,15 @@
 ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 
 
-# TODO - buildinfo
-# IF(UNIX)
-#   IF(WITH_BUILDINFO)
-#     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)
-#     SET(BUILD_TYPE ${CMAKE_BUILD_TYPE})
-#   ENDIF(WITH_BUILDINFO)
-# ENDIF(UNIX)
+# buildinfo
+IF(UNIX)
+	IF(WITH_BUILDINFO)
+		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)
+		# BUILD_PLATFORM and BUILD_PLATFORM are taken from CMake
+	ENDIF(WITH_BUILDINFO)
+ENDIF(UNIX)
 
 #-----------------------------------------------------------------------------
 # Common.

Modified: trunk/blender/source/creator/CMakeLists.txt
===================================================================
--- trunk/blender/source/creator/CMakeLists.txt	2009-09-24 14:39:14 UTC (rev 23456)
+++ trunk/blender/source/creator/CMakeLists.txt	2009-09-24 15:36:00 UTC (rev 23457)
@@ -78,15 +78,27 @@
 	INCLUDE_DIRECTORIES(${BINRELOC_INC})
 ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 
-MESSAGE(STATUS "Configuring blender")
+# Setup the exe sources and buildinfo
+SET(EXESRC creator.c)
 
 IF(WIN32)
-	ADD_EXECUTABLE(blender ${EXETYPE} creator.c ../icons/winblender.rc)
-ELSE(WIN32)
-	ADD_EXECUTABLE(blender ${EXETYPE} creator.c)
+	SET(EXESRC ${EXESRC} ../icons/winblender.rc)
 ENDIF(WIN32)
 
+IF(WITH_BUILDINFO)
+	ADD_DEFINITIONS(-DBUILD_DATE="${BUILD_DATE}")
+	ADD_DEFINITIONS(-DBUILD_TIME="${BUILD_TIME}")
+	ADD_DEFINITIONS(-DBUILD_REV="${BUILD_REV}")
+	ADD_DEFINITIONS(-DBUILD_PLATFORM="${CMAKE_SYSTEM_NAME}")
+	ADD_DEFINITIONS(-DBUILD_TYPE="${CMAKE_BUILD_TYPE}")
+	
+	SET(EXESRC ${EXESRC} buildinfo.c)
+ENDIF(WITH_BUILDINFO)
 
+MESSAGE(STATUS "Configuring blender")
+
+ADD_EXECUTABLE(blender ${EXETYPE} ${EXESRC})
+
 # Post build steps for bundling/packaging.
 
 SET(TARGETDIR ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR})

Modified: trunk/blender/source/creator/creator.c
===================================================================
--- trunk/blender/source/creator/creator.c	2009-09-24 14:39:14 UTC (rev 23456)
+++ trunk/blender/source/creator/creator.c	2009-09-24 15:36:00 UTC (rev 23457)
@@ -101,6 +101,7 @@
 #ifdef BUILD_DATE
 extern char * build_date;
 extern char * build_time;
+extern char * build_rev;
 extern char * build_platform;
 extern char * build_type;
 #endif