kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

replace string(... MATCHES "^const$) with string(... STREQUAL "const")

This commit is contained in:
Rolf Eike Beer 2013-06-02 21:42:10 +02:00
parent a4d8c64d10
commit cd4451d1e7
9 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/CMakeBackwardCompatibilityC.cmake
View File

@ -55,7 +55,7 @@ if(NOT CMAKE_SKIP_COMPATIBILITY_TESTS)
TEST_BIG_ENDIAN(CMAKE_WORDS_BIGENDIAN) TEST_BIG_ENDIAN(CMAKE_WORDS_BIGENDIAN)
include (FindX11) include (FindX11)
if("${X11_X11_INCLUDE_PATH}" MATCHES "^/usr/include$") if("${X11_X11_INCLUDE_PATH}" STREQUAL "/usr/include")
set (CMAKE_X_CFLAGS "" CACHE STRING "X11 extra flags.") set (CMAKE_X_CFLAGS "" CACHE STRING "X11 extra flags.")
else() else()
set (CMAKE_X_CFLAGS "-I${X11_X11_INCLUDE_PATH}" CACHE STRING set (CMAKE_X_CFLAGS "-I${X11_X11_INCLUDE_PATH}" CACHE STRING

4
Modules/CTest.cmake
View File

@ -84,13 +84,13 @@ if(BUILD_TESTING)
endmacro() endmacro()
macro(SET_IF_SET var val) macro(SET_IF_SET var val)
if(NOT "${val}" MATCHES "^$") if(NOT "${val}" STREQUAL "")
set("${var}" "${val}") set("${var}" "${val}")
endif() endif()
endmacro() endmacro()
macro(SET_IF_SET_AND_NOT_SET var val) macro(SET_IF_SET_AND_NOT_SET var val)
if(NOT "${val}" MATCHES "^$") if(NOT "${val}" STREQUAL "")
SET_IF_NOT_SET("${var}" "${val}") SET_IF_NOT_SET("${var}" "${val}")
endif() endif()
endmacro() endmacro()

2
Modules/ExternalData.cmake
View File

@ -391,7 +391,7 @@ function(_ExternalData_arg target arg options var_file)
# Regular expression to match associated files. # Regular expression to match associated files.
string(REGEX REPLACE "^REGEX:" "" regex "${opt}") string(REGEX REPLACE "^REGEX:" "" regex "${opt}")
list(APPEND associated_regex "${regex}") list(APPEND associated_regex "${regex}")
elseif("x${opt}" MATCHES "^x:$") elseif(opt STREQUAL ":")
# Activate series matching. # Activate series matching.
set(series_option "${opt}") set(series_option "${opt}")
elseif("x${opt}" MATCHES "^[^][:/*?]+$") elseif("x${opt}" MATCHES "^[^][:/*?]+$")

2
Modules/FindThreads.cmake
View File

@ -93,7 +93,7 @@ else()
COMPILE_OUTPUT_VARIABLE OUTPUT) COMPILE_OUTPUT_VARIABLE OUTPUT)
if(THREADS_HAVE_PTHREAD_ARG) if(THREADS_HAVE_PTHREAD_ARG)
if(THREADS_PTHREAD_ARG MATCHES "^2$") if(THREADS_PTHREAD_ARG STREQUAL "2")
set(Threads_FOUND TRUE) set(Threads_FOUND TRUE)
message(STATUS "Check if compiler accepts -pthread - yes") message(STATUS "Check if compiler accepts -pthread - yes")
else() else()

4
Modules/FindXMLRPC.cmake
View File

@ -53,7 +53,7 @@ if(XMLRPC_FOUND)
endif() endif()
# Parse the include flags. # Parse the include flags.
if("${XMLRPC_C_CONFIG_RESULT}" MATCHES "^0$") if("${XMLRPC_C_CONFIG_RESULT}" STREQUAL "0")
# Convert the compile flags to a CMake list. # Convert the compile flags to a CMake list.
string(REGEX REPLACE " +" ";" string(REGEX REPLACE " +" ";"
XMLRPC_C_CONFIG_CFLAGS "${XMLRPC_C_CONFIG_CFLAGS}") XMLRPC_C_CONFIG_CFLAGS "${XMLRPC_C_CONFIG_CFLAGS}")
@ -91,7 +91,7 @@ if(XMLRPC_FOUND)
endif() endif()
# Parse the library names and directories. # Parse the library names and directories.
if("${XMLRPC_C_CONFIG_RESULT}" MATCHES "^0$") if("${XMLRPC_C_CONFIG_RESULT}" STREQUAL "0")
string(REGEX REPLACE " +" ";" string(REGEX REPLACE " +" ";"
XMLRPC_C_CONFIG_LIBS "${XMLRPC_C_CONFIG_LIBS}") XMLRPC_C_CONFIG_LIBS "${XMLRPC_C_CONFIG_LIBS}")

13
Tests/Complex/CMakeLists.txt
View File

@ -45,12 +45,12 @@ endmacro()
TEST_ARGC(-DCMAKE_ARGV1 -DCMAKE_ARGV2 -DCMAKE_ARGV3 -DCMAKE_ARGV4) TEST_ARGC(-DCMAKE_ARGV1 -DCMAKE_ARGV2 -DCMAKE_ARGV3 -DCMAKE_ARGV4)
macro(TEST_VAR_ARG fa) macro(TEST_VAR_ARG fa)
if("${ARGV}" MATCHES "^1;2;3$") if("${ARGV}" STREQUAL "1;2;3")
message(STATUS "ARGV works") message(STATUS "ARGV works")
else() else()
message(FATAL_ERROR "ARGV does not work; got \"${ARGV}\" instead of \"1;2;3\"") message(FATAL_ERROR "ARGV does not work; got \"${ARGV}\" instead of \"1;2;3\"")
endif() endif()
if("${ARGN}" MATCHES "^2;3$") if("${ARGN}" STREQUAL "2;3")
message(STATUS "ARGN works") message(STATUS "ARGN works")
else() else()
message(FATAL_ERROR "ARGV does not work; got \"${ARGN}\" instead of \"2;3\"") message(FATAL_ERROR "ARGV does not work; got \"${ARGN}\" instead of \"2;3\"")
@ -163,7 +163,7 @@ execute_process(
COMMAND ${CMAKE_COMMAND} -E echo "ABCDEFG" COMMAND ${CMAKE_COMMAND} -E echo "ABCDEFG"
OUTPUT_VARIABLE TEST_OUT OUTPUT_VARIABLE TEST_OUT
) )
if("${TEST_OUT}" MATCHES "^ABCDEFG\n$") if("${TEST_OUT}" STREQUAL "ABCDEFG\n")
else() else()
message(SEND_ERROR "EXECUTE_PROCESS output test failed: [${TEST_OUT}]") message(SEND_ERROR "EXECUTE_PROCESS output test failed: [${TEST_OUT}]")
endif() endif()
@ -177,7 +177,7 @@ endif()
# ERROR_QUIET # ERROR_QUIET
# RESULT_VARIABLE RESULT # RESULT_VARIABLE RESULT
# ) # )
# if("${RESULT}" MATCHES "^0$") # if("${RESULT}" STREQUAL "0")
# message(SEND_ERROR # message(SEND_ERROR
# "EXECUTE_PROCESS result test failed with RESULT=[${RESULT}]") # "EXECUTE_PROCESS result test failed with RESULT=[${RESULT}]")
# else() # else()
@ -387,10 +387,7 @@ if(NOT RESULT)
message(SEND_ERROR "string(REGEX MATCHALL ... ) test failed.") message(SEND_ERROR "string(REGEX MATCHALL ... ) test failed.")
endif() endif()
string(REGEX REPLACE ".([bd])." "[\\1]" RESULT "a(b)c(d)e") string(REGEX REPLACE ".([bd])." "[\\1]" RESULT "a(b)c(d)e")
if("x${RESULT}" MATCHES "^xa\\[b\\]c\\[d\\]e$") if(NOT RESULT STREQUAL "a[b]c[d]e")
set(STRING_REGEX_PASSED 1)
endif()
if(NOT STRING_REGEX_PASSED)
message(SEND_ERROR message(SEND_ERROR
"string(REGEX REPLACE ... ) test failed (\"${RESULT}\" v. \"a[b]c[d]e\")") "string(REGEX REPLACE ... ) test failed (\"${RESULT}\" v. \"a[b]c[d]e\")")
endif() endif()

13
Tests/ComplexOneConfig/CMakeLists.txt
View File

@ -45,12 +45,12 @@ endmacro()
TEST_ARGC(-DCMAKE_ARGV1 -DCMAKE_ARGV2 -DCMAKE_ARGV3 -DCMAKE_ARGV4) TEST_ARGC(-DCMAKE_ARGV1 -DCMAKE_ARGV2 -DCMAKE_ARGV3 -DCMAKE_ARGV4)
macro(TEST_VAR_ARG fa) macro(TEST_VAR_ARG fa)
if("${ARGV}" MATCHES "^1;2;3$") if("${ARGV}" STREQUAL "1;2;3")
message(STATUS "ARGV works") message(STATUS "ARGV works")
else() else()
message(FATAL_ERROR "ARGV does not work; got \"${ARGV}\" instead of \"1;2;3\"") message(FATAL_ERROR "ARGV does not work; got \"${ARGV}\" instead of \"1;2;3\"")
endif() endif()
if("${ARGN}" MATCHES "^2;3$") if("${ARGN}" STREQUAL "2;3")
message(STATUS "ARGN works") message(STATUS "ARGN works")
else() else()
message(FATAL_ERROR "ARGV does not work; got \"${ARGN}\" instead of \"2;3\"") message(FATAL_ERROR "ARGV does not work; got \"${ARGN}\" instead of \"2;3\"")
@ -163,7 +163,7 @@ execute_process(
COMMAND ${CMAKE_COMMAND} -E echo "ABCDEFG" COMMAND ${CMAKE_COMMAND} -E echo "ABCDEFG"
OUTPUT_VARIABLE TEST_OUT OUTPUT_VARIABLE TEST_OUT
) )
if("${TEST_OUT}" MATCHES "^ABCDEFG\n$") if("${TEST_OUT}" STREQUAL "ABCDEFG\n")
else() else()
message(SEND_ERROR "EXECUTE_PROCESS output test failed: [${TEST_OUT}]") message(SEND_ERROR "EXECUTE_PROCESS output test failed: [${TEST_OUT}]")
endif() endif()
@ -177,7 +177,7 @@ endif()
# ERROR_QUIET # ERROR_QUIET
# RESULT_VARIABLE RESULT # RESULT_VARIABLE RESULT
# ) # )
# if("${RESULT}" MATCHES "^0$") # if("${RESULT}" STREQUAL "0")
# message(SEND_ERROR # message(SEND_ERROR
# "EXECUTE_PROCESS result test failed with RESULT=[${RESULT}]") # "EXECUTE_PROCESS result test failed with RESULT=[${RESULT}]")
# else() # else()
@ -357,10 +357,7 @@ if(NOT RESULT)
message(SEND_ERROR "string(REGEX MATCHALL ... ) test failed.") message(SEND_ERROR "string(REGEX MATCHALL ... ) test failed.")
endif() endif()
string(REGEX REPLACE ".([bd])." "[\\1]" RESULT "a(b)c(d)e") string(REGEX REPLACE ".([bd])." "[\\1]" RESULT "a(b)c(d)e")
if("x${RESULT}" MATCHES "^xa\\[b\\]c\\[d\\]e$") if(NOT RESULT STREQUAL "a[b]c[d]e")
set(STRING_REGEX_PASSED 1)
endif()
if(NOT STRING_REGEX_PASSED)
message(SEND_ERROR message(SEND_ERROR
"string(REGEX REPLACE ... ) test failed (\"${RESULT}\" v. \"a[b]c[d]e\")") "string(REGEX REPLACE ... ) test failed (\"${RESULT}\" v. \"a[b]c[d]e\")")
endif() endif()

2
Tests/SimpleInstall/CMakeLists.txt
View File

@ -122,7 +122,7 @@ if(STAGE2)
RESULT_VARIABLE SAMPLE_SCRIPT_RESULT RESULT_VARIABLE SAMPLE_SCRIPT_RESULT
OUTPUT_VARIABLE SAMPLE_SCRIPT_OUTPUT OUTPUT_VARIABLE SAMPLE_SCRIPT_OUTPUT
) )
if(NOT "${SAMPLE_SCRIPT_RESULT}" MATCHES "^0$") if(NOT "${SAMPLE_SCRIPT_RESULT}" STREQUAL "0")
message(FATAL_ERROR message(FATAL_ERROR
"Sample script [${CUR_SCRIPT}] failed: [${SAMPLE_SCRIPT_RESULT}]") "Sample script [${CUR_SCRIPT}] failed: [${SAMPLE_SCRIPT_RESULT}]")
endif() endif()

2
Tests/SimpleInstallS2/CMakeLists.txt
View File

@ -122,7 +122,7 @@ if(STAGE2)
RESULT_VARIABLE SAMPLE_SCRIPT_RESULT RESULT_VARIABLE SAMPLE_SCRIPT_RESULT
OUTPUT_VARIABLE SAMPLE_SCRIPT_OUTPUT OUTPUT_VARIABLE SAMPLE_SCRIPT_OUTPUT
) )
if(NOT "${SAMPLE_SCRIPT_RESULT}" MATCHES "^0$") if(NOT "${SAMPLE_SCRIPT_RESULT}" STREQUAL "0")
message(FATAL_ERROR message(FATAL_ERROR
"Sample script [${CUR_SCRIPT}] failed: [${SAMPLE_SCRIPT_RESULT}]") "Sample script [${CUR_SCRIPT}] failed: [${SAMPLE_SCRIPT_RESULT}]")
endif() endif()