diff options
author | Stephen Kelly <steveire@gmail.com> | 2015-04-13 19:20:25 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2015-04-15 15:43:50 (GMT) |
commit | 0076b5d8340be81057195e70853d33e8fb66c1db (patch) | |
tree | 52950ce2a6ba668dc111b65f9d3dd72d5213fed7 /Source/cmake.cxx | |
parent | 24b7f31d3a2a464cef5955648e4a152a19d44890 (diff) | |
download | CMake-0076b5d8340be81057195e70853d33e8fb66c1db.zip CMake-0076b5d8340be81057195e70853d33e8fb66c1db.tar.gz CMake-0076b5d8340be81057195e70853d33e8fb66c1db.tar.bz2 |
cmake: Remove the happy global property scope pattern.
Global properties are already global in scope, so remove the
overload for specifying it and port users of the API.
The call from cmMakefile::GetProperty can be simplified because
the scope is only used during chaining, and there is no further
chaining after processing global properties.
Diffstat (limited to 'Source/cmake.cxx')
-rw-r--r-- | Source/cmake.cxx | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx index e286295..a83596d 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -1514,7 +1514,7 @@ int cmake::ActualConfigure() cmMakefile* mf=this->GlobalGenerator->GetLocalGenerators()[0]->GetMakefile(); if (mf->IsOn("CTEST_USE_LAUNCHERS") - && !this->GetProperty("RULE_LAUNCH_COMPILE", cmProperty::GLOBAL)) + && !this->GetProperty("RULE_LAUNCH_COMPILE")) { cmSystemTools::Error("CTEST_USE_LAUNCHERS is enabled, but the " "RULE_LAUNCH_COMPILE global property is not defined.\n" @@ -2198,12 +2198,6 @@ void cmake::AppendProperty(const std::string& prop, const char *cmake::GetProperty(const std::string& prop) { - return this->GetProperty(prop, cmProperty::GLOBAL); -} - -const char *cmake::GetProperty(const std::string& prop, - cmProperty::ScopeType scope) -{ // watch for special properties std::string output = ""; if ( prop == "CACHE_VARIABLES" ) @@ -2238,7 +2232,7 @@ const char *cmake::GetProperty(const std::string& prop, } #undef STRING_LIST_ELEMENT bool dummy = false; - return this->Properties.GetPropertyValue(prop, scope, dummy); + return this->Properties.GetPropertyValue(prop, cmProperty::GLOBAL, dummy); } bool cmake::GetPropertyAsBool(const std::string& prop) |