diff options
| author | Brad King <brad.king@kitware.com> | 2015-01-15 14:54:02 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-01-15 14:54:02 (GMT) |
| commit | 6418eef222304db9a884a3cf101f86c2eabfb503 (patch) | |
| tree | 9625972f9b30214ed867949fd8890832d5bb2c83 /Source/cmMakefile.h | |
| parent | 44612e74075f751b01950dd0f00e86d61f9ba05a (diff) | |
| parent | 45ec182d27dc27412c94ccb49632e22a55d5fbe4 (diff) | |
| download | CMake-6418eef222304db9a884a3cf101f86c2eabfb503.zip CMake-6418eef222304db9a884a3cf101f86c2eabfb503.tar.gz CMake-6418eef222304db9a884a3cf101f86c2eabfb503.tar.bz2 | |
Merge topic 'fix-COMPILE_FEATURES-genex'
45ec182d Features: Fix the COMPILE_FEATURES genex for unavailable features.
2bead0eb cmMakefile: Rename a method to what it really does.
Diffstat (limited to 'Source/cmMakefile.h')
| -rw-r--r-- | Source/cmMakefile.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h index fcfec8d..bff8c12 100644 --- a/Source/cmMakefile.h +++ b/Source/cmMakefile.h @@ -965,7 +965,7 @@ public: const char* CompileFeaturesAvailable(const std::string& lang, std::string *error) const; - bool HaveFeatureAvailable(cmTarget const* target, std::string const& lang, + bool HaveStandardAvailable(cmTarget const* target, std::string const& lang, const std::string& feature) const; bool IsLaterStandard(std::string const& lang, @@ -1197,9 +1197,9 @@ private: void CheckNeededCxxLanguage(const std::string& feature, bool& needCxx98, bool& needCxx11, bool& needCxx14) const; - bool HaveCFeatureAvailable(cmTarget const* target, + bool HaveCStandardAvailable(cmTarget const* target, const std::string& feature) const; - bool HaveCxxFeatureAvailable(cmTarget const* target, + bool HaveCxxStandardAvailable(cmTarget const* target, const std::string& feature) const; mutable bool SuppressWatches; |