mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-14 19:07:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
instead of hacking a custom ADD_DEFINITIONS().

Approved by:	Kent Boortz (via IRC)
This commit is contained in:
Vasil Dimov 2010-12-02 12:04:10 +02:00
commit 8903bae21a
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
config.h.cmake
View file

@ -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"

4
storage/innobase/CMakeLists.txt
View file

@ -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")