summaryrefslogtreecommitdiff
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2021-05-10 09:52:01 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2021-05-10 09:52:01 +0300
commit8c73fab7f7622b58062955fba5b5666643fa46a0 (patch)
treeeae7981e88bf1ce40c89e66e2ccad918d8f178c7 /CMakeLists.txt
parent583b72ad0ddbc46a7aaeda1c1373b89d4bded9ea (diff)
parent98e6159892ae36d4ab82ce8f43b7e7bc0ab6bfa2 (diff)
downloadmariadb-git-8c73fab7f7622b58062955fba5b5666643fa46a0.tar.gz
Merge 10.3 into 10.4
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt23
1 files changed, 12 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0c0b8d746cb..35ef2f4b269 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,6 +15,18 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)
+
+IF(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+ # Setting build type to RelWithDebInfo as none was specified.
+ # Must occur before PROJECT
+ SET(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING
+ "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel"
+ FORCE)
+ # Set the possible values of build type for cmake-gui
+ SET_PROPERTY(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS
+ "None" "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
+ENDIF()
+
PROJECT(MySQL)
IF(POLICY CMP0022)
@@ -42,17 +54,6 @@ IF(NOT DEFINED MANUFACTURER)
MARK_AS_ADVANCED(MANUFACTURER)
ENDIF()
-IF(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
- # Setting build type to RelWithDebInfo as none was specified.")
- SET(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING
- "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel"
- FORCE)
- # Set the possible values of build type for cmake-gui
- SET_PROPERTY(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS
- "None" "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
-ENDIF()
-
-
# MAX_INDEXES - Set the maximum number of indexes per table, default 64
SET(MAX_INDEXES 64 CACHE STRING "Max number of indexes")
IF (${MAX_INDEXES} GREATER 128)