kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'minor-cleanups'

Browse Source 
47795421 Fix whitespace in docs.
aa283b6b Features: Fix test for GNU 4.8.1.
bbfd4cd4 Features: Include the language of the compiler in error messages.
This commit is contained in:
Brad King 2014-05-08 11:27:57 -04:00 committed by CMake Topic Stage
commit 3e206022ab
7 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Help/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.rst
View File

@ -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 .. _N1986: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2006/n1986.pdf
``cxx_deleted_functions`` ``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 .. _N2346: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2346.htm

2
Modules/Compiler/GNU-CXX-FeatureTests.cmake
View File

@ -3,7 +3,7 @@
set(_oldestSupported "(__GNUC__ * 100 + __GNUC_MINOR__) >= 408") set(_oldestSupported "(__GNUC__ * 100 + __GNUC_MINOR__) >= 408")
# Introduced in GCC 4.8.1 # 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_decltype_incomplete_return_types "${GNU481_CXX11}")
set(_cmake_feature_test_cxx_reference_qualified_functions "${GNU481_CXX11}") set(_cmake_feature_test_cxx_reference_qualified_functions "${GNU481_CXX11}")
set(GNU48_CXX11 "(__GNUC__ * 100 + __GNUC_MINOR__) >= 408 && __cplusplus >= 201103L") set(GNU48_CXX11 "(__GNUC__ * 100 + __GNUC_MINOR__) >= 408 && __cplusplus >= 201103L")

4
Source/cmMakefile.cxx
View File

@ -4608,7 +4608,7 @@ AddRequiredTargetFeature(cmTarget *target, const std::string& feature,
{ {
e << "No"; e << "No";
} }
e << " known features for compiler\n\"" e << " known features for " << lang << " compiler\n\""
<< this->GetDefinition("CMAKE_" + lang + "_COMPILER_ID") << this->GetDefinition("CMAKE_" + lang + "_COMPILER_ID")
<< "\"\nversion " << "\"\nversion "
<< this->GetDefinition("CMAKE_" + lang + "_COMPILER_VERSION") << "."; << this->GetDefinition("CMAKE_" + lang + "_COMPILER_VERSION") << ".";
@ -4631,7 +4631,7 @@ AddRequiredTargetFeature(cmTarget *target, const std::string& feature,
{ {
cmOStringStream e; cmOStringStream e;
e << "The compiler feature \"" << feature e << "The compiler feature \"" << feature
<< "\" is not known to compiler\n\"" << "\" is not known to " << lang << " compiler\n\""
<< this->GetDefinition("CMAKE_" + lang + "_COMPILER_ID") << this->GetDefinition("CMAKE_" + lang + "_COMPILER_ID")
<< "\"\nversion " << "\"\nversion "
<< this->GetDefinition("CMAKE_" + lang + "_COMPILER_VERSION") << "."; << this->GetDefinition("CMAKE_" + lang + "_COMPILER_VERSION") << ".";

2
Tests/RunCMake/CompileFeatures/NoSupportedCxxFeatures-stderr.txt
View File

@ -1,5 +1,5 @@
CMake Error at NoSupportedCxxFeatures.cmake:3 \(target_compile_features\): 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
"[^"]*" "[^"]*"

2
Tests/RunCMake/CompileFeatures/NoSupportedCxxFeaturesGenex-stderr.txt
View File

@ -1,5 +1,5 @@
CMake Error in CMakeLists.txt: CMake Error in CMakeLists.txt:
No known features for compiler No known features for CXX compiler
"[^"]*" "[^"]*"

2
Tests/RunCMake/target_compile_features/no_matching_cxx_feature-stderr.txt
View File

@ -1,5 +1,5 @@
CMake Error at no_matching_cxx_feature.cmake:[0-9][0-9]? \((target_compile_features|message)\): 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
"[^"]*" "[^"]*"

2
Tests/RunCMake/target_compile_features/no_matching_cxx_feature.cmake
View File

@ -3,7 +3,7 @@ if (NOT ";${CMAKE_CXX_COMPILE_FEATURES};" MATCHES ";gnu_cxx_typeof;"
AND NOT ";${CMAKE_CXX_COMPILE_FEATURES};" MATCHES ";msvc_cxx_sealed;" ) AND NOT ";${CMAKE_CXX_COMPILE_FEATURES};" MATCHES ";msvc_cxx_sealed;" )
# Simulate passing the test. # Simulate passing the test.
message(SEND_ERROR 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() return()
endif() endif()