From 9c61dcebaa784c0261c551be2ff2e2bc357c5688 Mon Sep 17 00:00:00 2001 From: Markus Makela Date: Wed, 24 Sep 2014 12:58:44 +0300 Subject: [PATCH] changed 'Release' build type to 'Optimized' and removed the default -O2 flags --- CMakeLists.txt | 2 +- macros.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 516dc194a..7830ee021 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,7 +33,7 @@ if(BUILD_TYPE MATCHES Debug) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ggdb -pthread -pipe -DSS_DEBUG -Wformat -Werror=format-security -fstack-protector --param=ssp-buffer-size=4") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ggdb -pthread -pipe -DSS_DEBUG -Wformat -Werror=format-security -fstack-protector --param=ssp-buffer-size=4") message(STATUS "Generating debugging symbols") -elseif(BUILD_TYPE MATCHES Release) +elseif(BUILD_TYPE MATCHES Optimized) if(NOT (DEFINED OLEVEL)) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2") diff --git a/macros.cmake b/macros.cmake index 0b985e9e4..71a7137a1 100644 --- a/macros.cmake +++ b/macros.cmake @@ -14,7 +14,7 @@ macro(set_variables) set(INSTALL_DIR "/usr/local/skysql/maxscale/" CACHE PATH "MaxScale installation directory.") # Build type - set(BUILD_TYPE "Release" CACHE STRING "Build type, possible values are:None (no optimization), Debug, Release.") + set(BUILD_TYPE "None" CACHE STRING "Build type, possible values are:None, Debug, Optimized.") # hostname or IP address of MaxScale's host set(TEST_HOST "127.0.0.1" CACHE STRING "hostname or IP address of MaxScale's host")