diff options
| author | Brad King <brad.king@kitware.com> | 2021-07-27 13:08:14 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-07-27 13:08:34 (GMT) |
| commit | a5f655bc0d9c399b2c5c06308b1c36dd62ac7732 (patch) | |
| tree | ab7253fe0549680617458bc498968e9623759c2a | |
| parent | 0615aeffbfa9e1e23dd24af640fdaddea7be9a94 (diff) | |
| parent | 91968ca66845dd560bb27710488a62b2be91c8ff (diff) | |
| download | CMake-a5f655bc0d9c399b2c5c06308b1c36dd62ac7732.zip CMake-a5f655bc0d9c399b2c5c06308b1c36dd62ac7732.tar.gz CMake-a5f655bc0d9c399b2c5c06308b1c36dd62ac7732.tar.bz2 | |
Merge topic 'test-compile-options-none' into release-3.21
91968ca668 Tests/CompileOptions: allow CMAKE_BUILD_TYPE=None
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6385
| -rw-r--r-- | Tests/CompileOptions/CMakeLists.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Tests/CompileOptions/CMakeLists.txt b/Tests/CompileOptions/CMakeLists.txt index 96bafea..1bedac0 100644 --- a/Tests/CompileOptions/CMakeLists.txt +++ b/Tests/CompileOptions/CMakeLists.txt @@ -65,6 +65,10 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "^(GNU|AppleClang|MSVC)$") string(APPEND CMAKE_CXX_FLAGS_RELEASE " -DFLAG_A=2 -DFLAG_C=1") string(APPEND CMAKE_CXX_FLAGS_RELWITHDEBINFO " -DFLAG_A=2 -DFLAG_C=1") string(APPEND CMAKE_CXX_FLAGS_MINSIZEREL " -DFLAG_A=2 -DFLAG_C=1") + string(TOUPPER "${CMAKE_BUILD_TYPE}" _xbuild_type) + if(NOT _xbuild_type MATCHES "^(DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL)$") + string(APPEND CMAKE_CXX_FLAGS_${_xbuild_type} " -DFLAG_A=2 -DFLAG_C=1") + endif() set_property(TARGET CompileOptions APPEND PROPERTY COMPILE_OPTIONS "-DFLAG_B=2" "-DFLAG_C=2" "-DFLAG_D=1") set_property(TARGET testlib APPEND PROPERTY INTERFACE_COMPILE_OPTIONS "-DFLAG_D=2") if(NOT CMAKE_GENERATOR MATCHES "^Visual Studio 9") |