summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2018-04-30 13:20:48 (GMT)
committerKitware Robot <kwrobot@kitware.com>2018-04-30 13:21:16 (GMT)
commitddff7aebbc9009f1eaae708919cc7bfc30707b16 (patch)
treefd5c84d5dcd41b8eba24faf8547b08c771790fc8
parent27279fa2db6fc7cce88d15b50ed2e736b208bb72 (diff)
parent2254b72061e08006e94c9a8ea3b9169f3f2cc1e6 (diff)
downloadCMake-ddff7aebbc9009f1eaae708919cc7bfc30707b16.zip
CMake-ddff7aebbc9009f1eaae708919cc7bfc30707b16.tar.gz
CMake-ddff7aebbc9009f1eaae708919cc7bfc30707b16.tar.bz2
Merge topic 'cxx-checks-tolerate-more-warnings'
2254b72061 C++ feature checks: Filter out warnings caused by local configuration Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2019
-rw-r--r--Source/Checks/cm_cxx_features.cmake3
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/Checks/cm_cxx_features.cmake b/Source/Checks/cm_cxx_features.cmake
index 2704c40..2a1abba 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)