summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Valavanis <valavanisalex@gmail.com>2017-02-07 12:36:55 +0000
committerAlex Valavanis <valavanisalex@gmail.com>2017-02-07 12:36:55 +0000
commit28564529b3c0027299756b428321ae64ced16de1 (patch)
tree9fb34ef9d27077d512909a1ae62bb62acebb2a2c
parentAdd new 'Strict' build type for deprecation checking (diff)
downloadinkscape-28564529b3c0027299756b428321ae64ced16de1.tar.gz
inkscape-28564529b3c0027299756b428321ae64ced16de1.zip
Don't make Strict build default
(bzr r15489)
-rw-r--r--CMakeLists.txt18
1 files changed, 15 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e38122b9e..f4b87c7cd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -50,9 +50,21 @@ endif()
# Define a very strict set of build flags that will prevent any use of deprecated symbols.
# This will almost certainly cause compilation failure and is intended only for developer use.
-set(CMAKE_BUILD_TYPE Strict)
-set(CMAKE_CXX_FLAGS_STRICT "${CMAKE_CXX_FLAGS_DEBUG} -Werror=deprecated-declarations -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTKMM_DISABLE_DEPRECATED -DGDKMM_DISABLE_DEPRECATED")
-set(CMAKE_C_FLAGS_STRICT "${CMAKE_C_FLAGS_DEBUG} -Werror=deprecated-declarations -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTKMM_DISABLE_DEPRECATED -DGDKMM_DISABLE_DEPRECATED")
+set(CMAKE_CXX_FLAGS_STRICT "${CMAKE_CXX_FLAGS_DEBUG} -Werror=deprecated-declarations -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTKMM_DISABLE_DEPRECATED -DGDKMM_DISABLE_DEPRECATED"
+ CACHE STRING
+ "Flags used by C++ compiler during Strict builds"
+ FORCE)
+set(CMAKE_C_FLAGS_STRICT "${CMAKE_C_FLAGS_DEBUG} -Werror=deprecated-declarations -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTKMM_DISABLE_DEPRECATED -DGDKMM_DISABLE_DEPRECATED"
+ CACHE STRING
+ "Flags used by C compiler during Strict builds"
+ FORCE)
+mark_as_advanced(
+ CMAKE_CXX_FLAGS_STRICT
+ CMAKE_C_FLAGS_STRICT)
+
+set(CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE} CACHE STRING
+ "Choose the type of build, options are: None(CMAKE_CXXFLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel Strict."
+ FORCE)
# -----------------------------------------------------------------------------
# Redirect output files