diff options
| author | Brad King <brad.king@kitware.com> | 2021-08-11 13:24:00 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-08-11 13:24:15 (GMT) |
| commit | f64ad3b97f284ae61380a223cc27d80f020a5613 (patch) | |
| tree | 5c1cb07c6f58f302bd0e3cf027308369569f7ceb | |
| parent | b8027decf99ee0ede95d2c4ce02fec19f622351a (diff) | |
| parent | 3941b74de4043a1a8a173a61c4f5efe0a8a55d33 (diff) | |
| download | CMake-f64ad3b97f284ae61380a223cc27d80f020a5613.zip CMake-f64ad3b97f284ae61380a223cc27d80f020a5613.tar.gz CMake-f64ad3b97f284ae61380a223cc27d80f020a5613.tar.bz2 | |
Merge topic 'refactor-cmGlobalGenerator_GetGlobalSetting-returns-cmProp'
3941b74de4 Refactor: cmGlobalGenerator::GetGlobalSetting returns cmProp
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6441
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 6 | ||||
| -rw-r--r-- | Source/cmGlobalGenerator.h | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index aae6e35..3561deb 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -1179,10 +1179,10 @@ void cmGlobalGenerator::FillExtensionToLanguageMap(const std::string& l, } } -const char* cmGlobalGenerator::GetGlobalSetting(std::string const& name) const +cmProp cmGlobalGenerator::GetGlobalSetting(std::string const& name) const { assert(!this->Makefiles.empty()); - return cmToCStr(this->Makefiles[0]->GetDefinition(name)); + return this->Makefiles[0]->GetDefinition(name); } bool cmGlobalGenerator::GlobalSettingIsOn(std::string const& name) const @@ -1195,7 +1195,7 @@ std::string cmGlobalGenerator::GetSafeGlobalSetting( std::string const& name) const { assert(!this->Makefiles.empty()); - return this->Makefiles[0]->GetSafeDefinition(name); + return this->Makefiles[0]->GetDefinition(name); } bool cmGlobalGenerator::IgnoreFile(const char* ext) const diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h index f0b59bf..34646d9 100644 --- a/Source/cmGlobalGenerator.h +++ b/Source/cmGlobalGenerator.h @@ -23,6 +23,7 @@ #include "cmCustomCommandLines.h" #include "cmDuration.h" #include "cmExportSet.h" +#include "cmProperty.h" #include "cmStateSnapshot.h" #include "cmStringAlgorithms.h" #include "cmSystemTools.h" @@ -308,7 +309,7 @@ public: cmExportSetMap& GetExportSets() { return this->ExportSets; } - const char* GetGlobalSetting(std::string const& name) const; + cmProp GetGlobalSetting(std::string const& name) const; bool GlobalSettingIsOn(std::string const& name) const; std::string GetSafeGlobalSetting(std::string const& name) const; |