diff options
| author | Brad King <brad.king@kitware.com> | 2018-04-30 09:18:58 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-04-30 09:18:58 -0400 |
| commit | 321442580e5a082ff52dba24237e89b355bc55b6 (patch) | |
| tree | 442b2c480f5ac6a85877c8310c5edc88fc1d2f08 | |
| parent | 1f06c0d8a86f88b35d435798147ac1f422d87621 (diff) | |
| parent | 2254b72061e08006e94c9a8ea3b9169f3f2cc1e6 (diff) | |
| download | cmake-321442580e5a082ff52dba24237e89b355bc55b6.tar.gz | |
Merge branch 'cxx-checks-tolerate-more-warnings' into release-3.11
Merge-request: !2019
| -rw-r--r-- | Source/Checks/cm_cxx_features.cmake | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/Checks/cm_cxx_features.cmake b/Source/Checks/cm_cxx_features.cmake index 2704c4032a..2a1abbab61 100644 --- a/Source/Checks/cm_cxx_features.cmake +++ b/Source/Checks/cm_cxx_features.cmake @@ -19,6 +19,9 @@ function(cm_check_cxx_feature name) string(REGEX REPLACE " +0 Warning\\(s\\)" "" check_output "${check_output}") # Filter out warnings caused by user flags. string(REGEX REPLACE "[^\n]*warning:[^\n]*-Winvalid-command-line-argument[^\n]*" "" check_output "${check_output}") + # Filter out warnings caused by local configuration. + string(REGEX REPLACE "[^\n]*warning:[^\n]*directory not found for option[^\n]*" "" check_output "${check_output}") + string(REGEX REPLACE "[^\n]*warning:[^\n]*object file compiled with -mlong-branch which is no longer needed[^\n]*" "" check_output "${check_output}") # If using the feature causes warnings, treat it as broken/unavailable. if(check_output MATCHES "[Ww]arning") set(CMake_HAVE_CXX_${FEATURE} OFF CACHE INTERNAL "TRY_COMPILE" FORCE) |