diff options
| author | Brad King <brad.king@kitware.com> | 2021-08-11 13:25:09 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-08-11 13:26:51 (GMT) |
| commit | c236dd37c9e68a0d14d82d2b07ceff69959629d4 (patch) | |
| tree | dfab44fe54a01c4cf947e6aec1884a1cb78233e9 | |
| parent | f64ad3b97f284ae61380a223cc27d80f020a5613 (diff) | |
| parent | 791337f18124d745dd08a8f141cc258656dc052b (diff) | |
| download | CMake-c236dd37c9e68a0d14d82d2b07ceff69959629d4.zip CMake-c236dd37c9e68a0d14d82d2b07ceff69959629d4.tar.gz CMake-c236dd37c9e68a0d14d82d2b07ceff69959629d4.tar.bz2 | |
Merge topic 'refactor-cmCommonTargetGenerator_GetFeature-returns-cmProp'
791337f181 Refactor: cmCommonTargetGenerator::GetFeature returns cmProp
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6440
| -rw-r--r-- | Source/cmCommonTargetGenerator.cxx | 6 | ||||
| -rw-r--r-- | Source/cmCommonTargetGenerator.h | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/Source/cmCommonTargetGenerator.cxx b/Source/cmCommonTargetGenerator.cxx index 7c2e20c..59e4141 100644 --- a/Source/cmCommonTargetGenerator.cxx +++ b/Source/cmCommonTargetGenerator.cxx @@ -39,10 +39,10 @@ std::vector<std::string> const& cmCommonTargetGenerator::GetConfigNames() const return this->ConfigNames; } -const char* cmCommonTargetGenerator::GetFeature(const std::string& feature, - const std::string& config) +cmProp cmCommonTargetGenerator::GetFeature(const std::string& feature, + const std::string& config) { - return this->GeneratorTarget->GetFeature(feature, config)->c_str(); + return this->GeneratorTarget->GetFeature(feature, config); } void cmCommonTargetGenerator::AddModuleDefinitionFlag( diff --git a/Source/cmCommonTargetGenerator.h b/Source/cmCommonTargetGenerator.h index e1a4f8b..463a445 100644 --- a/Source/cmCommonTargetGenerator.h +++ b/Source/cmCommonTargetGenerator.h @@ -8,6 +8,8 @@ #include <string> #include <vector> +#include "cmProperty.h" + class cmGeneratorTarget; class cmGlobalCommonGenerator; class cmLinkLineComputer; @@ -28,8 +30,7 @@ public: protected: // Feature query methods. - const char* GetFeature(const std::string& feature, - const std::string& config); + cmProp GetFeature(const std::string& feature, const std::string& config); // Helper to add flag for windows .def file. void AddModuleDefinitionFlag(cmLinkLineComputer* linkLineComputer, |