Ticket #60400: patch-mysql56-version-change.diff

File patch-mysql56-version-change.diff, 757 bytes (added by kencu (Ken), 4 years ago)

  • cmake/mysql_version.cmake 

    diff --git cmake/mysql_version.cmake cmake/mysql_version.cmake
index 34ed6f4..89e238c 100644
    SET(DOT_FRM_VERSION "6") 
    3131
    3232# Generate "something" to trigger cmake rerun when VERSION changes
    3333CONFIGURE_FILE(
    34   ${CMAKE_SOURCE_DIR}/VERSION
     34  ${CMAKE_SOURCE_DIR}/VERSION.txt
    3535  ${CMAKE_BINARY_DIR}/VERSION.dep
    3636)
    3737
    … … CONFIGURE_FILE( 
    3939
    4040MACRO(MYSQL_GET_CONFIG_VALUE keyword var)
    4141 IF(NOT ${var})
    42    FILE (STRINGS ${CMAKE_SOURCE_DIR}/VERSION str REGEX "^[ ]*${keyword}=")
     42   FILE (STRINGS ${CMAKE_SOURCE_DIR}/VERSION.txt str REGEX "^[ ]*${keyword}=")
    4343   IF(str)
    4444     STRING(REPLACE "${keyword}=" "" str ${str})
    4545     STRING(REGEX REPLACE  "[ ].*" ""  str "${str}")