Quote CMake variables expansions in `CIBuildType.cmake`

This avoids CMake errors when `${CMAKE_C_FLAGS_CI}` or
`${CMAKE_CXX_FLAGS_CI}` expands to the empty string.

Fixes #846.

diff --git a/cmake/CIBuildType.cmake b/cmake/CIBuildType.cmake
index e72161414d2c95058c973ebc55b2029c0e7d9b18..8246ecca4ec20aaf7a3f4eb0893b8485fa6876f7 100644 (file)
--- a/cmake/CIBuildType.cmake
+++ b/cmake/CIBuildType.cmake
@@ -1,18 +1,18 @@
 # Add a build type called "CI" which is like RelWithDebInfo but with assertions
 # enabled, i.e. without passing -DNDEBUG to the compiler.
 
-set(CMAKE_CXX_FLAGS_CI ${CMAKE_CXX_FLAGS_RELWITHDEBINFO} CACHE STRING
+set(CMAKE_CXX_FLAGS_CI "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}" CACHE STRING
  "Flags used by the C++ compiler during CI builds."
   FORCE)
-set(CMAKE_C_FLAGS_CI ${CMAKE_C_FLAGS_RELWITHDEBINFO} CACHE STRING
+set(CMAKE_C_FLAGS_CI "${CMAKE_C_FLAGS_RELWITHDEBINFO}" CACHE STRING
   "Flags used by the C compiler during CI builds."
   FORCE)
 set(CMAKE_EXE_LINKER_FLAGS_CI
-  ${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO} CACHE STRING
+  "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO}" CACHE STRING
   "Flags used for linking binaries during CI builds."
   FORCE)
 set(CMAKE_SHARED_LINKER_FLAGS_CI
-  ${CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO} CACHE STRING
+  "${CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO}" CACHE STRING
   "Flags used by the shared libraries linker during CI builds."
   FORCE)
 mark_as_advanced(
@@ -25,7 +25,7 @@ set(CMAKE_BUILD_TYPE "${CMAKE_BUILD_TYPE}" CACHE STRING
   "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel CI."
   FORCE)
 
-string(REGEX REPLACE "[/-]DNDEBUG" "" CMAKE_CXX_FLAGS_CI ${CMAKE_CXX_FLAGS_CI})
-string(REGEX REPLACE "[/-]DNDEBUG" "" CMAKE_C_FLAGS_CI ${CMAKE_C_FLAGS_CI})
-string(STRIP ${CMAKE_CXX_FLAGS_CI} CMAKE_CXX_FLAGS_CI)
-string(STRIP ${CMAKE_C_FLAGS_CI} CMAKE_C_FLAGS_CI)
+string(REGEX REPLACE "[/-]DNDEBUG" "" CMAKE_CXX_FLAGS_CI "${CMAKE_CXX_FLAGS_CI}")
+string(REGEX REPLACE "[/-]DNDEBUG" "" CMAKE_C_FLAGS_CI "${CMAKE_C_FLAGS_CI}")
+string(STRIP "${CMAKE_CXX_FLAGS_CI}" CMAKE_CXX_FLAGS_CI)
+string(STRIP "${CMAKE_C_FLAGS_CI}" CMAKE_C_FLAGS_CI)