Changeset: bae4dfa14fc7 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/bae4dfa14fc7
Modified Files:
cmake/monetdb-defines.cmake
cmake/monetdb-toolchain.cmake
Branch: Jul2021
Log Message:
Fix regular expressions to do what they were meant to do.
diffs (51 lines):
diff --git a/cmake/monetdb-defines.cmake b/cmake/monetdb-defines.cmake
--- a/cmake/monetdb-defines.cmake
+++ b/cmake/monetdb-defines.cmake
@@ -340,7 +340,7 @@ macro(monetdb_configure_misc)
CACHE STRING
"Password hash algorithm, one of MD5, SHA1, RIPEMD160, SHA224, SHA256,
SHA384, SHA512, defaults to SHA512")
- if(NOT ${PASSWORD_BACKEND} MATCHES
"^MD5|SHA1|RIPEMD160|SHA224|SHA256|SHA384|SHA512$")
+ if(NOT ${PASSWORD_BACKEND} MATCHES
"^(MD5|SHA1|RIPEMD160|SHA224|SHA256|SHA384|SHA512)$")
message(FATAL_ERROR
"PASSWORD_BACKEND invalid, choose one of MD5, SHA1, RIPEMD160, SHA224,
SHA256, SHA384, SHA512")
endif()
diff --git a/cmake/monetdb-toolchain.cmake b/cmake/monetdb-toolchain.cmake
--- a/cmake/monetdb-toolchain.cmake
+++ b/cmake/monetdb-toolchain.cmake
@@ -10,7 +10,7 @@ function(monetdb_default_toolchain)
if (${FORCE_COLORED_OUTPUT})
if ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU")
MT_addCompilerFlag("-fdiagnostics-color=always"
"-fdiagnostics-color=always" "${CMAKE_C_FLAGS}" "all" CMAKE_C_FLAGS)
- elseif ("${CMAKE_C_COMPILER_ID}" MATCHES "^Clang|AppleClang$")
+ elseif ("${CMAKE_C_COMPILER_ID}" MATCHES "^(Clang|AppleClang)$")
MT_addCompilerFlag("-fcolor-diagnostics" "-fcolor-diagnostics"
"${CMAKE_C_FLAGS}" "all" CMAKE_C_FLAGS)
endif ()
endif ()
@@ -26,7 +26,7 @@ function(monetdb_default_toolchain)
endif()
if(STRICT)
- if(${CMAKE_C_COMPILER_ID} MATCHES "^GNU|Clang|AppleClang$")
+ if(${CMAKE_C_COMPILER_ID} MATCHES "^(GNU|Clang|AppleClang)$")
MT_addCompilerFlag("-Werror" "-Werror" "${CMAKE_C_FLAGS}" "all"
CMAKE_C_FLAGS)
MT_addCompilerFlag("-Wall" "-Wall" "${CMAKE_C_FLAGS}" "all"
CMAKE_C_FLAGS)
MT_addCompilerFlag("-Wextra" "-Wextra" "${CMAKE_C_FLAGS}" "all"
CMAKE_C_FLAGS)
@@ -112,7 +112,7 @@ function(monetdb_default_compiler_option
if (${FORCE_COLORED_OUTPUT})
if ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU")
add_compile_options("-fdiagnostics-color=always")
- elseif ("${CMAKE_C_COMPILER_ID}" MATCHES "^Clang|AppleClang$")
+ elseif ("${CMAKE_C_COMPILER_ID}" MATCHES "^(Clang|AppleClang)$")
add_compile_options("-fcolor-diagnostics")
endif ()
endif ()
@@ -128,7 +128,7 @@ function(monetdb_default_compiler_option
endif()
if(STRICT)
- if(${CMAKE_C_COMPILER_ID} MATCHES "^GNU|Clang|AppleClang$")
+ if(${CMAKE_C_COMPILER_ID} MATCHES "^(GNU|Clang|AppleClang)$")
add_compile_options("-Werror")
add_compile_options("-Wall")
add_compile_options("-Wextra")
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
