#At file:///MySQL/REPO/V55/bug42969-5.5/ based on revid:joerg@stripped
3210 Joerg Bruehe 2011-01-31
Buf#42969 Please add a MANIFEST to each build
Additional fixes to get some missing information logged.
modified:
cmake/info_macros.cmake.in
=== modified file 'cmake/info_macros.cmake.in'
--- a/cmake/info_macros.cmake.in 2011-01-31 19:32:10 +0000
+++ b/cmake/info_macros.cmake.in 2011-01-31 21:14:38 +0000
@@ -20,6 +20,8 @@
SET(VERSION "@VERSION@")
SET(CMAKE_SOURCE_DIR "@CMAKE_SOURCE_DIR@")
SET(CMAKE_BINARY_DIR "@CMAKE_BINARY_DIR@")
+SET(CMAKE_GENERATOR "@CMAKE_GENERATOR@")
+SET(CMAKE_SIZEOF_VOID_P "@CMAKE_SIZEOF_VOID_P@")
SET(BZR_EXECUTABLE "@BZR_EXECUTABLE@")
@@ -70,9 +72,9 @@ MACRO(CREATE_INFO_BIN)
FILE(WRITE ${INFO_BIN} "===== Information about the build process: =====\n")
IF (WIN32)
- EXECUTE_PROCESS(COMMAND date /c /T OUTPUT_VARIABLE TMP_DATE)
+ EXECUTE_PROCESS(COMMAND cmd /c date /T OUTPUT_VARIABLE TMP_DATE)
ELSEIF(UNIX)
- EXECUTE_PROCESS(COMMAND date "+%Y-%m-%d %H:%M:%S" OUTPUT_VARIABLE TMP_DATE)
+ EXECUTE_PROCESS(COMMAND date "+%Y-%m-%d %H:%M:%S" OUTPUT_VARIABLE TMP_DATE OUTPUT_STRIP_TRAILING_WHITESPACE)
ELSE()
SET(TMP_DATE "No date command known")
ENDIF()
@@ -104,6 +106,7 @@ MACRO(CREATE_INFO_BIN)
FILE(APPEND ${INFO_BIN} "File 'sql/CMakeFiles/sql.dir/flags.make' is not yet found.\n\n")
ENDIF()
ENDIF()
+ FILE(APPEND ${INFO_BIN} "Pointer size: ${CMAKE_SIZEOF_VOID_P}\n\n")
FILE(APPEND ${INFO_BIN} "===== Feature flags used: =====\n")
IF(EXISTS ${CMAKE_BINARY_DIR}/CMakeCache.txt)
Attachment: [text/bzr-bundle] bzr/joerg@mysql.com-20110131211438-n5mkkqwo5g99qkrl.bundle
| Thread |
|---|
| • bzr commit into mysql-5.5-bugteam branch (joerg:3210) | Joerg Bruehe | 31 Jan |