diff options
Diffstat (limited to 'cmake/check_compiler_flag.cmake')
| -rw-r--r-- | cmake/check_compiler_flag.cmake | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/cmake/check_compiler_flag.cmake b/cmake/check_compiler_flag.cmake index 4a029659f43..303d5d8d3c8 100644 --- a/cmake/check_compiler_flag.cmake +++ b/cmake/check_compiler_flag.cmake @@ -9,11 +9,13 @@ SET(fail_patterns FAIL_REGEX "unrecognized .*option" FAIL_REGEX "ignoring unknown option" FAIL_REGEX "warning:.*ignored" + FAIL_REGEX "warning:.*is valid for.*but not for" FAIL_REGEX "warning:.*redefined" FAIL_REGEX "[Ww]arning: [Oo]ption" ) -MACRO (MY_CHECK_C_COMPILER_FLAG flag result) +MACRO (MY_CHECK_C_COMPILER_FLAG flag) + STRING(REGEX REPLACE "[-,= ]" "_" result "HAVE_C_${flag}") SET(SAVE_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}") SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${flag}") CHECK_C_SOURCE_COMPILES("int main(void) { return 0; }" ${result} @@ -21,7 +23,8 @@ MACRO (MY_CHECK_C_COMPILER_FLAG flag result) SET(CMAKE_REQUIRED_FLAGS "${SAVE_CMAKE_REQUIRED_FLAGS}") ENDMACRO() -MACRO (MY_CHECK_CXX_COMPILER_FLAG flag result) +MACRO (MY_CHECK_CXX_COMPILER_FLAG flag) + STRING(REGEX REPLACE "[-,= ]" "_" result "HAVE_CXX_${flag}") SET(SAVE_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}") SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${flag}") CHECK_CXX_SOURCE_COMPILES("int main(void) { return 0; }" ${result} @@ -35,10 +38,11 @@ FUNCTION(MY_CHECK_AND_SET_COMPILER_FLAG flag) IF(WIN32) RETURN() ENDIF() - MY_CHECK_C_COMPILER_FLAG(${flag} HAVE_C_${flag}) - MY_CHECK_CXX_COMPILER_FLAG(${flag} HAVE_CXX_${flag}) + MY_CHECK_C_COMPILER_FLAG(${flag}) + MY_CHECK_CXX_COMPILER_FLAG(${flag}) + STRING(REGEX REPLACE "[-,= ]" "_" result "${flag}") FOREACH(lang C CXX) - IF (HAVE_${lang}_${flag}) + IF (HAVE_${lang}_${result}) IF(ARGN) FOREACH(type ${ARGN}) SET(CMAKE_${lang}_FLAGS_${type} "${CMAKE_${lang}_FLAGS_${type}} ${flag}" PARENT_SCOPE) |