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