From 9c370806c51443300bc3121d00d612231500cb31 Mon Sep 17 00:00:00 2001 From: nick black Date: Tue, 1 Jun 2021 04:08:24 -0400 Subject: [PATCH] CMake: define CMAKE_BUILD_TYPE prior to use --- CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 981f6e129..2f525e2a6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,6 +30,10 @@ option(USE_QRCODEGEN "Enable libqrcodegen QR code support" OFF) option(USE_STATIC "Build static libraries (in addition to shared)" ON) set(USE_MULTIMEDIA "ffmpeg" CACHE STRING "Multimedia engine, one of 'ffmpeg', 'oiio', or 'none'") set_property(CACHE USE_MULTIMEDIA PROPERTY STRINGS ffmpeg oiio none) +if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) + set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE + STRING "Choose the build mode." FORCE) +endif() set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS Debug Release MinSizeRel RelWithDebInfo Coverage) ############## END (additional) USER-SELECTABLE OPTIONS ################## set(USE_FFMPEG OFF) @@ -42,10 +46,6 @@ elseif(NOT ${USE_MULTIMEDIA} STREQUAL "none") message(FATAL_ERROR "USE_MULTIMEDIA must be one of 'oiio', 'ffmpeg', 'none' (was '${USE_MULTIMEDIA}')") endif() -if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) - set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE - STRING "Choose the build mode." FORCE) -endif() string(APPEND CMAKE_C_FLAGS_DEBUG " -Og") string(APPEND CMAKE_CXX_FLAGS_DEBUG " -Og") if("${USE_COVERAGE}")