diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-06-28 22:01:55 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-06-28 22:01:55 +0200 |
| commit | 3361aee591b1eb8c676f60887ffc535cd509890a (patch) | |
| tree | 54a65f83ba7d9293e6f8e8281ad920fbae6eb823 /cmake/check_compiler_flag.cmake | |
| parent | 6ce20fb2b9fe57330c797694b9dbea4028f40d7c (diff) | |
| parent | 0fdb17e6c3f50ae22eb97b6363bcbd8b0cd9e040 (diff) | |
| download | mariadb-git-3361aee591b1eb8c676f60887ffc535cd509890a.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'cmake/check_compiler_flag.cmake')
| -rw-r--r-- | cmake/check_compiler_flag.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmake/check_compiler_flag.cmake b/cmake/check_compiler_flag.cmake index 303d5d8d3c8..ef675959059 100644 --- a/cmake/check_compiler_flag.cmake +++ b/cmake/check_compiler_flag.cmake @@ -15,7 +15,7 @@ SET(fail_patterns ) MACRO (MY_CHECK_C_COMPILER_FLAG flag) - STRING(REGEX REPLACE "[-,= ]" "_" result "HAVE_C_${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} @@ -24,7 +24,7 @@ MACRO (MY_CHECK_C_COMPILER_FLAG flag) ENDMACRO() MACRO (MY_CHECK_CXX_COMPILER_FLAG flag) - STRING(REGEX REPLACE "[-,= ]" "_" result "HAVE_CXX_${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} @@ -40,7 +40,7 @@ FUNCTION(MY_CHECK_AND_SET_COMPILER_FLAG flag) ENDIF() MY_CHECK_C_COMPILER_FLAG(${flag}) MY_CHECK_CXX_COMPILER_FLAG(${flag}) - STRING(REGEX REPLACE "[-,= ]" "_" result "${flag}") + STRING(REGEX REPLACE "[-,= +]" "_" result "${flag}") FOREACH(lang C CXX) IF (HAVE_${lang}_${result}) IF(ARGN) |