diff options
| -rw-r--r-- | Source/CTest/cmCTestSubmitHandler.cxx | 2 | ||||
| -rw-r--r-- | Source/cmCTest.cxx | 6 | ||||
| -rw-r--r-- | Source/cmExtraEclipseCDT4Generator.cxx | 2 | ||||
| -rw-r--r-- | Source/cmLocalNinjaGenerator.cxx | 3 | ||||
| -rw-r--r-- | Source/cmMakefile.cxx | 2 | ||||
| -rw-r--r-- | Source/cmake.cxx | 10 | ||||
| -rw-r--r-- | Source/cmake.h | 2 |
7 files changed, 9 insertions, 18 deletions
diff --git a/Source/CTest/cmCTestSubmitHandler.cxx b/Source/CTest/cmCTestSubmitHandler.cxx index d585863..4cdcd45 100644 --- a/Source/CTest/cmCTestSubmitHandler.cxx +++ b/Source/CTest/cmCTestSubmitHandler.cxx @@ -1132,7 +1132,7 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file, cmCTestScriptHandler* ch = static_cast<cmCTestScriptHandler*>(this->CTest->GetHandler("script")); cmake* cm = ch->GetCMake(); - const char* subproject = cm->GetProperty("SubProject", cmProperty::GLOBAL); + const char* subproject = cm->GetProperty("SubProject"); // TODO: Encode values for a URL instead of trusting caller. std::ostringstream str; str << "project=" diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx index 6715638..d54a651 100644 --- a/Source/cmCTest.cxx +++ b/Source/cmCTest.cxx @@ -1558,12 +1558,12 @@ void cmCTest::AddSiteProperties(std::ostream& ostr) return; } // This code should go when cdash is changed to use labels only - const char* subproject = cm->GetProperty("SubProject", cmProperty::GLOBAL); + const char* subproject = cm->GetProperty("SubProject"); if(subproject) { ostr << "<Subproject name=\"" << subproject << "\">\n"; const char* labels = - ch->GetCMake()->GetProperty("SubProjectLabels", cmProperty::GLOBAL); + ch->GetCMake()->GetProperty("SubProjectLabels"); if(labels) { ostr << " <Labels>\n"; @@ -1581,7 +1581,7 @@ void cmCTest::AddSiteProperties(std::ostream& ostr) } // This code should stay when cdash only does label based sub-projects - const char* label = cm->GetProperty("Label", cmProperty::GLOBAL); + const char* label = cm->GetProperty("Label"); if(label) { ostr << "<Labels>\n"; diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx index 35b70e8..16d5119 100644 --- a/Source/cmExtraEclipseCDT4Generator.cxx +++ b/Source/cmExtraEclipseCDT4Generator.cxx @@ -470,7 +470,7 @@ void cmExtraEclipseCDT4Generator::CreateProjectFile() } if (const char *extraNaturesProp = mf->GetCMakeInstance()-> - GetProperty("ECLIPSE_EXTRA_NATURES", cmProperty::GLOBAL)) + GetProperty("ECLIPSE_EXTRA_NATURES")) { std::vector<std::string> extraNatures; cmSystemTools::ExpandListArgument(extraNaturesProp, extraNatures); diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx index 640c1b3..124e849 100644 --- a/Source/cmLocalNinjaGenerator.cxx +++ b/Source/cmLocalNinjaGenerator.cxx @@ -234,8 +234,7 @@ void cmLocalNinjaGenerator::WritePools(std::ostream& os) { cmGlobalNinjaGenerator::WriteDivider(os); - const char* jobpools = this->GetCMakeInstance() - ->GetProperty("JOB_POOLS", cmProperty::GLOBAL); + const char* jobpools = this->GetCMakeInstance()->GetProperty("JOB_POOLS"); if (jobpools) { cmGlobalNinjaGenerator::WriteComment(os, diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index be3bcdc..2fe1e33 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -4239,7 +4239,7 @@ const char *cmMakefile::GetProperty(const std::string& prop, return this->LocalGenerator->GetParent()->GetMakefile()-> GetProperty(prop, scope); } - return this->GetCMakeInstance()->GetProperty(prop,scope); + return this->GetCMakeInstance()->GetProperty(prop); } return retVal; 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) diff --git a/Source/cmake.h b/Source/cmake.h index 359e7bf..27f28ac 100644 --- a/Source/cmake.h +++ b/Source/cmake.h @@ -253,8 +253,6 @@ class cmake void AppendProperty(const std::string& prop, const char *value,bool asString=false); const char *GetProperty(const std::string& prop); - const char *GetProperty(const std::string& prop, - cmProperty::ScopeType scope); bool GetPropertyAsBool(const std::string& prop); ///! Get or create an cmInstalledFile instance and return a pointer to it |