diff options
| author | Vladislav Vaintroub <vvaintroub@linux-rbsx> | 2010-01-20 00:52:21 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <vvaintroub@linux-rbsx> | 2010-01-20 00:52:21 +0100 |
| commit | a71e4cf18e819fa99fdedf17ae1b070f62c401e0 (patch) | |
| tree | e73bf16289b6e08db5b2b5c23042b8bf2136af5d /cmake/build_configurations | |
| parent | 7753db1d17741050ed2b2dc450a83c5054ffb91a (diff) | |
| download | mariadb-git-a71e4cf18e819fa99fdedf17ae1b070f62c401e0.tar.gz | |
- another take on BUILD_CONFIG variable - use OPTION instead of SET for
boolean variables to ensure option is in cache. Also use documented CMAKE_USE_MAKE_RULES_OVERRIDE feature instead of INCLUDE.
- remove superfluous tests in innobase's CMakeLists.txt
Diffstat (limited to 'cmake/build_configurations')
| -rw-r--r-- | cmake/build_configurations/mysql_release.cmake | 34 |
1 files changed, 20 insertions, 14 deletions
diff --git a/cmake/build_configurations/mysql_release.cmake b/cmake/build_configurations/mysql_release.cmake index 1769565f065..a2a3d9ca046 100644 --- a/cmake/build_configurations/mysql_release.cmake +++ b/cmake/build_configurations/mysql_release.cmake @@ -15,15 +15,15 @@ # This file includes build settings used for MySQL release -SET(WITH_INNOBASE_STORAGE_ENGINE 1) -SET(WITH_ARCHIVE_STORAGE_ENGINE 1) -SET(WITH_BLACKHOLE_STORAGE_ENGINE 1) -SET(WITH_FEDERATED_STORAGE_ENGINE 1) -SET(WITHOUT_EXAMPLE_STORAGE_ENGINE 1) -SET(WITH_EMBEDDED_SERVER 1) -SET(ENABLE_LOCAL_INFILE TRUE) -SET(WITH_SSL bundled) -SET(WITH_ZLIB bundled) +OPTION(WITH_INNOBASE_STORAGE_ENGINE "" ON) +OPTION(WITH_ARCHIVE_STORAGE_ENGINE "" ON) +OPTION(WITH_BLACKHOLE_STORAGE_ENGINE "" ON) +OPTION(WITH_FEDERATED_STORAGE_ENGINE "" ON ) +OPTION(WITHOUT_EXAMPLE_STORAGE_ENGINE "" ON) +OPTION(WITH_EMBEDDED_SERVER "" ON) +OPTION(ENABLE_LOCAL_INFILE "" ON) +SET(WITH_SSL bundled CACHE STRING "") +SET(WITH_ZLIB bundled CACHE STRING "") IF(NOT COMPILATION_COMMENT) @@ -32,12 +32,12 @@ ENDIF() IF(UNIX) SET(CMAKE_INSTALL_PREFIX "/usr/local/mysql") - SET(WITH_EXTRA_CHARSETS complex) - SET(WITH_READLINE TRUE) - SET(WITH_PIC TRUE) + SET(WITH_EXTRA_CHARSETS complex CACHE STRING "") + OPTION(WITH_READLINE "" ON) + OPTION(WITH_PIC "" ON) # Default GCC flags - IF(CMAKE_C_COMPILER_IS_GNUCXX) + IF(CMAKE_COMPILER_IS_GNUCXX) SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-g -O3 -static-libgcc -fno-omit-frame-pointer") SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-g -O3 -static-libgcc -fno-omit-frame-pointer -felide-constructors -fno-exceptions -fno-rtti") ENDIF() @@ -89,4 +89,10 @@ IF(UNIX) ENDIF() ENDIF() - ENDIF() + IF(CMAKE_CXX_FLAGS_RELWITHDEBINFO) + SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}" + CACHE STRING "Compile flags") + SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}" + CACHE STRING "Compile flags") + ENDIF() +ENDIF() |