3109 Joerg Bruehe 2011-01-28 [merge]
Merge for next test.
modified:
cmake/info_macros.cmake.in
3108 Joerg Bruehe 2011-01-28 [merge]
Merge for test.
modified:
cmake/make_dist.cmake.in
=== modified file 'cmake/info_macros.cmake.in'
--- a/cmake/info_macros.cmake.in 2011-01-28 12:33:43 +0000
+++ b/cmake/info_macros.cmake.in 2011-01-28 14:27:31 +0000
@@ -50,6 +50,7 @@ MACRO(CREATE_INFO_SRC target_dir)
# it cannot be improved.
ELSEIF(EXISTS ${CMAKE_SOURCE_DIR}/Docs/INFO_SRC)
# If we are building from a source distribution, it also contains "INFO_SRC".
+ # Similar, the export used for a release build already has the file.
FILE(READ ${CMAKE_SOURCE_DIR}/Docs/INFO_SRC SOURCE_INFO)
FILE(WRITE ${INFO_SRC} "${SOURCE_INFO}\n")
FILE(APPEND ${INFO_SRC} "\n(2) Source ${CMAKE_SOURCE_DIR} - Binaries ${CMAKE_BINARY_DIR} - Target ${target_dir}\n")
@@ -58,12 +59,13 @@ MACRO(CREATE_INFO_SRC target_dir)
FILE(READ ${CMAKE_SOURCE_DIR}/INFO_SRC SOURCE_INFO)
FILE(WRITE ${INFO_SRC} "${SOURCE_INFO}\n")
FILE(APPEND ${INFO_SRC} "\n(3) Source ${CMAKE_SOURCE_DIR} - Binaries ${CMAKE_BINARY_DIR} - Target ${target_dir}\n")
- ELSEIF(EXISTS ./INFO_SRC)
- # This is a special rule for our release build environment,
- # where we already exported from a BZR tree and added "bzr version-info".
- FILE(READ ./INFO_SRC SOURCE_INFO)
- FILE(WRITE ${INFO_SRC} "${SOURCE_INFO}\n")
- FILE(APPEND ${INFO_SRC} "\n(4) Source ${CMAKE_SOURCE_DIR} - Binaries ${CMAKE_BINARY_DIR} - Target ${target_dir}\n")
+# ELSEIF(EXISTS ./INFO_SRC)
+# Doesn't work anyway: "EXISTS" and "READ" use different base ...
+# # This is a special rule for our release build environment,
+# # where we already exported from a BZR tree and added "bzr version-info".
+# FILE(READ ./INFO_SRC SOURCE_INFO)
+# FILE(WRITE ${INFO_SRC} "${SOURCE_INFO}\n")
+# FILE(APPEND ${INFO_SRC} "\n(4) Source ${CMAKE_SOURCE_DIR} - Binaries ${CMAKE_BINARY_DIR} - Target ${target_dir}\n")
ELSE()
# This is a fall-back.
FILE(WRITE ${INFO_SRC} "\nMySQL source ${VERSION}\n")
No bundle (reason: useless for push emails).
