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)
15 years ago · 8903bae21a
2 changed files with 3 additions and 4 deletions
--- a/config.h.cmake
+++ b/config.h.cmake
@ -604,6 +604,9 @@

 #cmakedefine SO_EXT "@CMAKE_SHARED_MODULE_SUFFIX@"

+#define MYSQL_MAJOR_VERSION @MAJOR_VERSION@
+#define MYSQL_MINOR_VERSION @MINOR_VERSION@
+
 #define PACKAGE "mysql"
 #define PACKAGE_BUGREPORT ""
 #define PACKAGE_NAME "MySQL Server"
--- a/storage/innobase/CMakeLists.txt
+++ b/storage/innobase/CMakeLists.txt
@ -19,10 +19,6 @@ INCLUDE(CheckFunctionExists)
 INCLUDE(CheckCSourceCompiles)
 INCLUDE(CheckCSourceRuns)

-# Make MySQL version available to InnoDB
-ADD_DEFINITIONS("-DMYSQL_MAJOR_VERSION=${MAJOR_VERSION}")
-ADD_DEFINITIONS("-DMYSQL_MINOR_VERSION=${MINOR_VERSION}")
-
 # OS tests
 IF(UNIX)
  IF(CMAKE_SYSTEM_NAME STREQUAL "Linux")