From 1c35814649d13c1d0698f1ee881b123c1359c8de Mon Sep 17 00:00:00 2001 From: Pyry Haulos Date: Thu, 19 Mar 2015 11:39:44 -0700 Subject: [PATCH] Fix RelWithAsserts build type, remove build type validation This change fixes typo (RELEASEWITHASSERTS -> RELWITHASSERTS) that prevented cmake from choosing right optimization flags. In addition build type validation has been removed since some project file generators (MSVC generator for example) support multiple build types and there is no build type defined at gen time. Change-Id: I1f4856c029eb9dbfd2a4b665f204da00bf68e7e4 --- framework/delibs/cmake/Defs.cmake | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/framework/delibs/cmake/Defs.cmake b/framework/delibs/cmake/Defs.cmake index 04ad5d4..d40bd73 100644 --- a/framework/delibs/cmake/Defs.cmake +++ b/framework/delibs/cmake/Defs.cmake @@ -39,21 +39,11 @@ macro (DE_MAKE_ENV_BOOL BASE VALUE) endif () endmacro () -# Add build type release with asserts -set(CMAKE_CXX_FLAGS_RELEASEWITHASSERTS ${CMAKE_CXX_FLAGS_RELEASE}) -set(CMAKE_C_FLAGS_RELEASEWITHASSERTS ${CMAKE_C_FLAGS_RELEASE}) -set(CMAKE_EXE_LINKER_FLAGS_RELEASEWITHASSERTS ${CMAKE_EXE_LINKER_FLAGS_RELEASE}) -set(CMAKE_SHARED_LINKER_FLAGS_RELEASEWITHASSERTS ${CMAKE_SHARED_LINKER_FLAGS_RELEASE}) - -# cmake doesn't validate build type. -if (NOT CMAKE_BUILD_TYPE STREQUAL "Debug" - AND NOT CMAKE_BUILD_TYPE STREQUAL "Release" - AND NOT CMAKE_BUILD_TYPE STREQUAL "RelWithAsserts" - AND NOT CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo" - AND NOT CMAKE_BUILD_TYPE STREQUAL "MinSizeRel") - - message(FATAL_ERROR "Unknown build type ${CMAKE_BUILD_TYPE} available build types Debug, Release, RelWithAsserts, RelWithDebInfo and MinSizeRel") -endif() +# Add build type RelWithAsserts +set(CMAKE_CXX_FLAGS_RELWITHASSERTS ${CMAKE_CXX_FLAGS_RELEASE}) +set(CMAKE_C_FLAGS_RELWITHASSERTS ${CMAKE_C_FLAGS_RELEASE}) +set(CMAKE_EXE_LINKER_FLAGS_RELWITHASSERTS ${CMAKE_EXE_LINKER_FLAGS_RELEASE}) +set(CMAKE_SHARED_LINKER_FLAGS_RELWITHASSERTS ${CMAKE_SHARED_LINKER_FLAGS_RELEASE}) # Os detection if (NOT DEFINED DE_OS) -- 2.7.4