List:Commits« Previous MessageNext Message »
From:Joerg Bruehe Date:January 26 2011 9:05am
Subject:bzr push into mysql-5.5-bugteam branch (joerg:3101 to 3102)
View as plain text  
 3102 Joerg Bruehe	2011-01-26 [merge]
      Merge fixes for next test build.

    modified:
      cmake/info_macros.cmake.in
 3101 Joerg Bruehe	2011-01-25 [merge]
      Next step for a test build. 42969

    renamed:
      cmake/version_files.cmake.in => cmake/info_macros.cmake.in
    modified:
      CMakeLists.txt
      cmake/make_dist.cmake.in
      cmake/info_macros.cmake.in
=== modified file 'cmake/info_macros.cmake.in'
--- a/cmake/info_macros.cmake.in	2011-01-25 20:51:38 +0000
+++ b/cmake/info_macros.cmake.in	2011-01-26 08:53:07 +0000
@@ -46,7 +46,7 @@ MACRO(CREATE_INFO_SRC target_dir)
     FILE(APPEND ${INFO_SRC} "\n(1) Source ${CMAKE_SOURCE_DIR} - Binaries ${CMAKE_BINARY_DIR} - Target ${target_dir}\n")
   ELSEIF(EXISTS ../INFO_SRC)
     # The following is a special rule for our build environment, where we already exported from a BZR tree.
-    FILE(READ ../INFO_SRC SOURCE_INFO
+    FILE(READ ../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")
   ELSEIF(NOT EXISTS ${target_dir}/INFO_SRC)
@@ -100,7 +100,8 @@ MACRO(CREATE_INFO_BIN)
 
   FILE(APPEND ${INFO_BIN} "===== Feature flags used: =====\n")
   IF(EXISTS ${CMAKE_BINARY_DIR}/CMakeCache.txt)
-    EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -L ${CMAKE_BINARY_DIR} OUTPUT_VARIABLE FEATURE_FLAGS)
+    # Attention: "-N" prevents cmake from entering a recursion, and it must be a separate flag from "-L".
+    EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -N -L ${CMAKE_BINARY_DIR} OUTPUT_VARIABLE FEATURE_FLAGS)
     FILE(APPEND ${INFO_BIN} ${FEATURE_FLAGS} "\n\n")
   ELSE()
     FILE(APPEND ${INFO_BIN} "File 'CMakeCache.txt' is not yet found.\n\n")

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.5-bugteam branch (joerg:3101 to 3102) Joerg Bruehe26 Jan