Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2011-01-07 11:43:29 +0300
committerCampbell Barton <ideasman42@gmail.com>2011-01-07 11:43:29 +0300
commit54ceccd0eeabc3e5cf8fb17882bc5c60fce6253e (patch)
tree0a7a09eaa0612a3ec6584ff629eff762b698e2d0 /CMakeLists.txt
parentf3a00259e240535c69814951edff24d0d89833db (diff)
- cmake use execute_process, exec_program is deprecated.
- game engine builds without python again.
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt12
1 files changed, 6 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d3095347ab4..772bca71fb5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -885,18 +885,18 @@ endif()
if(WITH_BUILDINFO)
# BUILD_PLATFORM and BUILD_PLATFORM are taken from CMake
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 RETURN_VALUE BUILD_REV_RETURN)
+ execute_process(COMMAND date "+%Y-%m-%d" OUTPUT_VARIABLE BUILD_DATE OUTPUT_STRIP_TRAILING_WHITESPACE)
+ execute_process(COMMAND date "+%H:%M:%S" OUTPUT_VARIABLE BUILD_TIME OUTPUT_STRIP_TRAILING_WHITESPACE)
+ execute_process(COMMAND svnversion ${CMAKE_SOURCE_DIR} OUTPUT_VARIABLE BUILD_REV RESULT_VARIABLE BUILD_REV_RETURN OUTPUT_STRIP_TRAILING_WHITESPACE)
if(BUILD_REV_RETURN)
set(BUILD_REV "unknown")
endif()
endif()
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 RETURN_VALUE BUILD_REV_RETURN)
+ execute_process(COMMAND cmd /c date /t OUTPUT_VARIABLE BUILD_DATE OUTPUT_STRIP_TRAILING_WHITESPACE)
+ execute_process(COMMAND cmd /c time /t OUTPUT_VARIABLE BUILD_TIME OUTPUT_STRIP_TRAILING_WHITESPACE)
+ execute_process(COMMAND svnversion ${CMAKE_SOURCE_DIR} OUTPUT_VARIABLE BUILD_REV RESULT_VARIABLE BUILD_REV_RETURN OUTPUT_STRIP_TRAILING_WHITESPACE)
if(BUILD_REV_RETURN)
set(BUILD_REV "unknown")
endif()