bzr commit into mysql-5.5-bugteam branch (magnus.blaudd:3136) WL#5665

[Magnus Blåudd]

#At file:///home/msvensson/mysql/5.5-bugteam/ based on revid:sergey.glukhov@strippedysxw

 3136 Magnus Blåudd	2010-11-24
      WL#5665: Removal of the autotools-based build system
       - Make the cmake files depend on VERSION, causing
         cmake rerun when VERSION changes

    modified:
      VERSION
      cmake/mysql_version.cmake
=== modified file 'VERSION'
--- a/VERSION	2010-11-20 14:47:50 +0000
+++ b/VERSION	2010-11-24 10:19:38 +0000
@@ -1,4 +1,4 @@
 MYSQL_VERSION_MAJOR=5
 MYSQL_VERSION_MINOR=5
 MYSQL_VERSION_PATCH=8
-MYSQL_VERSION_EXTRA=
+MYSQL_VERSION_EXTRA=-ndb-7.0.20-aplha

=== modified file 'cmake/mysql_version.cmake'
--- a/cmake/mysql_version.cmake	2010-11-20 22:56:09 +0000
+++ b/cmake/mysql_version.cmake	2010-11-24 10:19:38 +0000
@@ -21,17 +21,21 @@ SET(SHARED_LIB_MAJOR_VERSION "16")
 SET(PROTOCOL_VERSION "10")
 SET(DOT_FRM_VERSION "6")
 
+# Generate "something" to trigger cmake rerun when VERSION changes
+CONFIGURE_FILE(
+  ${CMAKE_SOURCE_DIR}/VERSION
+  ${CMAKE_BINARY_DIR}/VERSION.dep
+)
+
 # Read value for a variable from VERSION.
 
 MACRO(MYSQL_GET_CONFIG_VALUE keyword var)
  IF(NOT ${var})
-   IF (EXISTS ${CMAKE_SOURCE_DIR}/VERSION)
-     FILE (STRINGS ${CMAKE_SOURCE_DIR}/VERSION str REGEX "^[ ]*${keyword}=")
-    IF(str)
-      STRING(REPLACE "${keyword}=" "" str ${str})
-      STRING(REGEX REPLACE  "[ ].*" ""  str "${str}")
-      SET(${var} ${str})
-    ENDIF()
+   FILE (STRINGS ${CMAKE_SOURCE_DIR}/VERSION str REGEX "^[ ]*${keyword}=")
+   IF(str)
+     STRING(REPLACE "${keyword}=" "" str ${str})
+     STRING(REGEX REPLACE  "[ ].*" ""  str "${str}")
+     SET(${var} ${str})
    ENDIF()
  ENDIF()
 ENDMACRO()

Attachment: [text/bzr-bundle] bzr/[e-mail]