From bbfd4cd48fd7966ac5a539028fc3e397643f5593 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Wed, 7 May 2014 12:36:22 +0200 Subject: Features: Include the language of the compiler in error messages. --- Source/cmMakefile.cxx | 4 ++-- Tests/RunCMake/CompileFeatures/NoSupportedCxxFeatures-stderr.txt | 2 +- Tests/RunCMake/CompileFeatures/NoSupportedCxxFeaturesGenex-stderr.txt | 2 +- .../target_compile_features/no_matching_cxx_feature-stderr.txt | 2 +- Tests/RunCMake/target_compile_features/no_matching_cxx_feature.cmake | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 9ad637a..f94cac0 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -4560,7 +4560,7 @@ AddRequiredTargetFeature(cmTarget *target, const std::string& feature, { e << "No"; } - e << " known features for compiler\n\"" + e << " known features for " << lang << " compiler\n\"" << this->GetDefinition("CMAKE_" + lang + "_COMPILER_ID") << "\"\nversion " << this->GetDefinition("CMAKE_" + lang + "_COMPILER_VERSION") << "."; @@ -4583,7 +4583,7 @@ AddRequiredTargetFeature(cmTarget *target, const std::string& feature, { cmOStringStream e; e << "The compiler feature \"" << feature - << "\" is not known to compiler\n\"" + << "\" is not known to " << lang << " compiler\n\"" << this->GetDefinition("CMAKE_" + lang + "_COMPILER_ID") << "\"\nversion " << this->GetDefinition("CMAKE_" + lang + "_COMPILER_VERSION") << "."; diff --git a/Tests/RunCMake/CompileFeatures/NoSupportedCxxFeatures-stderr.txt b/Tests/RunCMake/CompileFeatures/NoSupportedCxxFeatures-stderr.txt index 8b029ac..fc882cb 100644 --- a/Tests/RunCMake/CompileFeatures/NoSupportedCxxFeatures-stderr.txt +++ b/Tests/RunCMake/CompileFeatures/NoSupportedCxxFeatures-stderr.txt @@ -1,5 +1,5 @@ CMake Error at NoSupportedCxxFeatures.cmake:3 \(target_compile_features\): - target_compile_features no known features for compiler + target_compile_features no known features for CXX compiler "[^"]*" diff --git a/Tests/RunCMake/CompileFeatures/NoSupportedCxxFeaturesGenex-stderr.txt b/Tests/RunCMake/CompileFeatures/NoSupportedCxxFeaturesGenex-stderr.txt index d8366b2..66d0d41 100644 --- a/Tests/RunCMake/CompileFeatures/NoSupportedCxxFeaturesGenex-stderr.txt +++ b/Tests/RunCMake/CompileFeatures/NoSupportedCxxFeaturesGenex-stderr.txt @@ -1,5 +1,5 @@ CMake Error in CMakeLists.txt: - No known features for compiler + No known features for CXX compiler "[^"]*" diff --git a/Tests/RunCMake/target_compile_features/no_matching_cxx_feature-stderr.txt b/Tests/RunCMake/target_compile_features/no_matching_cxx_feature-stderr.txt index 4c76c7a..f976dfe 100644 --- a/Tests/RunCMake/target_compile_features/no_matching_cxx_feature-stderr.txt +++ b/Tests/RunCMake/target_compile_features/no_matching_cxx_feature-stderr.txt @@ -1,5 +1,5 @@ CMake Error at no_matching_cxx_feature.cmake:[0-9][0-9]? \((target_compile_features|message)\): - The compiler feature "[^"]+" is not known to compiler + The compiler feature "[^"]+" is not known to CXX compiler "[^"]*" diff --git a/Tests/RunCMake/target_compile_features/no_matching_cxx_feature.cmake b/Tests/RunCMake/target_compile_features/no_matching_cxx_feature.cmake index 0452dbf..ab1fd76 100644 --- a/Tests/RunCMake/target_compile_features/no_matching_cxx_feature.cmake +++ b/Tests/RunCMake/target_compile_features/no_matching_cxx_feature.cmake @@ -3,7 +3,7 @@ if (NOT ";${CMAKE_CXX_COMPILE_FEATURES};" MATCHES ";gnu_cxx_typeof;" AND NOT ";${CMAKE_CXX_COMPILE_FEATURES};" MATCHES ";msvc_cxx_sealed;" ) # Simulate passing the test. message(SEND_ERROR - "The compiler feature \"gnu_cxx_dummy\" is not known to compiler\n\"GNU\"\nversion 4.8.1." + "The compiler feature \"gnu_cxx_dummy\" is not known to CXX compiler\n\"GNU\"\nversion 4.8.1." ) return() endif() -- cgit v0.12 From aa283b6b0137dad796af2e5c58912783790cc849 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Wed, 7 May 2014 12:40:42 +0200 Subject: Features: Fix test for GNU 4.8.1. --- Modules/Compiler/GNU-CXX-FeatureTests.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/Compiler/GNU-CXX-FeatureTests.cmake b/Modules/Compiler/GNU-CXX-FeatureTests.cmake index fe0ff0b..3aeb27f 100644 --- a/Modules/Compiler/GNU-CXX-FeatureTests.cmake +++ b/Modules/Compiler/GNU-CXX-FeatureTests.cmake @@ -3,7 +3,7 @@ set(_oldestSupported "(__GNUC__ * 100 + __GNUC_MINOR__) >= 408") # Introduced in GCC 4.8.1 -set(GNU481_CXX11 "((__GNUC__ * 100 + __GNUC_MINOR__) > 408 || __GNUC_PATCHLEVEL__ >= 1) && __cplusplus >= 201103L") +set(GNU481_CXX11 "((__GNUC__ * 100 + __GNUC_MINOR__) >= 408 && __GNUC_PATCHLEVEL__ >= 1) && __cplusplus >= 201103L") set(_cmake_feature_test_cxx_decltype_incomplete_return_types "${GNU481_CXX11}") set(_cmake_feature_test_cxx_reference_qualified_functions "${GNU481_CXX11}") set(GNU48_CXX11 "(__GNUC__ * 100 + __GNUC_MINOR__) >= 408 && __cplusplus >= 201103L") -- cgit v0.12 From 4779542157c4fee31eedcd3c057fb19bdffe47bd Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Wed, 7 May 2014 16:31:16 +0200 Subject: Fix whitespace in docs. --- Help/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Help/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.rst b/Help/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.rst index b8b0fcd..643bd3b 100644 --- a/Help/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.rst +++ b/Help/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.rst @@ -73,7 +73,7 @@ The features known to this version of CMake are: .. _N1986: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2006/n1986.pdf ``cxx_deleted_functions`` - Deleted functions, as defined in N2346_. + Deleted functions, as defined in N2346_. .. _N2346: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2346.htm -- cgit v0.12