diff options
author | Arystanbek Dyussenov <arystan.d@gmail.com> | 2009-11-02 19:41:57 +0300 |
---|---|---|
committer | Arystanbek Dyussenov <arystan.d@gmail.com> | 2009-11-02 19:41:57 +0300 |
commit | 91fcccc3ad5fd907ebba816797e35199757f2d18 (patch) | |
tree | d260825a4e8ff56d654f348db2734c382f98d455 /CMakeLists.txt | |
parent | 52001f5ffbb8840399a9aa6839ee2f94b924e0e9 (diff) | |
parent | 84eb897caa029f1dc8bd9e61298fa7bfb8ccc622 (diff) |
Merge from trunk -r 23968:24181.
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5cb14f37305..a649a5e0a8d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -549,15 +549,27 @@ ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux") # buildinfo -IF(UNIX) - IF(WITH_BUILDINFO) +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) - # BUILD_PLATFORM and BUILD_PLATFORM are taken from CMake - ENDIF(WITH_BUILDINFO) -ENDIF(UNIX) - + 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 RETURN_VALUE BUILD_REV_RETURN) + IF(BUILD_REV_RETURN) + SET(BUILD_REV "unknown") + ENDIF(BUILD_REV_RETURN) + ENDIF(WIN32) +ENDIF(WITH_BUILDINFO) + #----------------------------------------------------------------------------- # Common. |