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.cxx | |
| 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.cxx')
| -rw-r--r-- | Source/cmMakefile.cxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index d188331..b532a38 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -5271,18 +5271,19 @@ CompileFeaturesAvailable(const std::string& lang, std::string *error) const } //---------------------------------------------------------------------------- -bool cmMakefile::HaveFeatureAvailable(cmTarget const* target, +bool cmMakefile::HaveStandardAvailable(cmTarget const* target, std::string const& lang, const std::string& feature) const { return lang == "C" - ? this->HaveCFeatureAvailable(target, feature) - : this->HaveCxxFeatureAvailable(target, feature); + ? this->HaveCStandardAvailable(target, feature) + : this->HaveCxxStandardAvailable(target, feature); } //---------------------------------------------------------------------------- bool cmMakefile:: -HaveCFeatureAvailable(cmTarget const* target, const std::string& feature) const +HaveCStandardAvailable(cmTarget const* target, + const std::string& feature) const { bool needC90 = false; bool needC99 = false; @@ -5359,7 +5360,7 @@ bool cmMakefile::IsLaterStandard(std::string const& lang, } //---------------------------------------------------------------------------- -bool cmMakefile::HaveCxxFeatureAvailable(cmTarget const* target, +bool cmMakefile::HaveCxxStandardAvailable(cmTarget const* target, const std::string& feature) const { bool needCxx98 = false; |