Commit 8903bae2 authored by Vasil Dimov's avatar Vasil Dimov

Define MYSQL_(MAJOR|MINOR)_VERSION the way things are defined in CMake

instead of hacking a custom ADD_DEFINITIONS().

Approved by:	Kent Boortz (via IRC)
parent 60fd9a18
...@@ -604,6 +604,9 @@ ...@@ -604,6 +604,9 @@
#cmakedefine SO_EXT "@CMAKE_SHARED_MODULE_SUFFIX@" #cmakedefine SO_EXT "@CMAKE_SHARED_MODULE_SUFFIX@"
#define MYSQL_MAJOR_VERSION @MAJOR_VERSION@
#define MYSQL_MINOR_VERSION @MINOR_VERSION@
#define PACKAGE "mysql" #define PACKAGE "mysql"
#define PACKAGE_BUGREPORT "" #define PACKAGE_BUGREPORT ""
#define PACKAGE_NAME "MySQL Server" #define PACKAGE_NAME "MySQL Server"
......
...@@ -19,10 +19,6 @@ INCLUDE(CheckFunctionExists) ...@@ -19,10 +19,6 @@ INCLUDE(CheckFunctionExists)
INCLUDE(CheckCSourceCompiles) INCLUDE(CheckCSourceCompiles)
INCLUDE(CheckCSourceRuns) INCLUDE(CheckCSourceRuns)
# Make MySQL version available to InnoDB
ADD_DEFINITIONS("-DMYSQL_MAJOR_VERSION=${MAJOR_VERSION}")
ADD_DEFINITIONS("-DMYSQL_MINOR_VERSION=${MINOR_VERSION}")
# OS tests # OS tests
IF(UNIX) IF(UNIX)
IF(CMAKE_SYSTEM_NAME STREQUAL "Linux") IF(CMAKE_SYSTEM_NAME STREQUAL "Linux")
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment