diff options
| author | Brad King <brad.king@kitware.com> | 2016-12-05 15:56:32 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-12-05 15:56:32 (GMT) |
| commit | 41f11259317668d53c9712afbb6cbc1580c45681 (patch) | |
| tree | ba8bd87267694f449f1e6d20d9467c8e6b86eef9 /Source/cmMakefile.h | |
| parent | d59010e47fa953afb7f638fbab1a65195478d3fa (diff) | |
| parent | 97c1e569245f655b5701c0b5b38bc1daa19f1750 (diff) | |
| download | CMake-41f11259317668d53c9712afbb6cbc1580c45681.zip CMake-41f11259317668d53c9712afbb6cbc1580c45681.tar.gz CMake-41f11259317668d53c9712afbb6cbc1580c45681.tar.bz2 | |
Merge topic 'features-c++17'
97c1e569 Help: Add release note for C++ 17 support
85c8e652 Features: Activate C++ 17 support for AppleClang 6.1+
8084f7a6 Features: Activate C++ 17 support for Clang 3.5+
24e29d41 Features: Activate C++ 17 support for GNU 5.1+
ae1a6815 Features: Add infrastructure for C++ 17 language standard
684e4d20 Features: Make feature recording conditions more consistent
Diffstat (limited to 'Source/cmMakefile.h')
| -rw-r--r-- | Source/cmMakefile.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h index 859b3c8..3484e5a 100644 --- a/Source/cmMakefile.h +++ b/Source/cmMakefile.h @@ -905,7 +905,8 @@ private: void CheckNeededCLanguage(const std::string& feature, bool& needC90, bool& needC99, bool& needC11) const; void CheckNeededCxxLanguage(const std::string& feature, bool& needCxx98, - bool& needCxx11, bool& needCxx14) const; + bool& needCxx11, bool& needCxx14, + bool& needCxx17) const; bool HaveCStandardAvailable(cmTarget const* target, const std::string& feature) const; |