Merge topic 'getfeature-prop'

bradking · kwrobot · commit 35928fa7ca4c · 2020-07-14T07:20:15.000-04:00
18726ad GetFeature(): return cmProp Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5004
diff --git a/Source/cmCommonTargetGenerator.cxx b/Source/cmCommonTargetGenerator.cxx
@@ -41,7 +41,7 @@ std::vector<std::string> const& cmCommonTargetGenerator::GetConfigNames() const
 const char* cmCommonTargetGenerator::GetFeature(const std::string& feature,
                                                 const std::string& config)
 {
-  return this->GeneratorTarget->GetFeature(feature, config);
+  return this->GeneratorTarget->GetFeature(feature, config)->c_str();
 }
 
 void cmCommonTargetGenerator::AddModuleDefinitionFlag(
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
@@ -815,18 +815,18 @@ void cmGeneratorTarget::ComputeObjectMapping()
   }
 }
 
-const char* cmGeneratorTarget::GetFeature(const std::string& feature,
-                                          const std::string& config) const
+cmProp cmGeneratorTarget::GetFeature(const std::string& feature,
+                                     const std::string& config) const
 {
   if (!config.empty()) {
     std::string featureConfig =
       cmStrCat(feature, '_', cmSystemTools::UpperCase(config));
     if (cmProp value = this->GetProperty(featureConfig)) {
-      return value->c_str();
+      return value;
     }
   }
   if (cmProp value = this->GetProperty(feature)) {
-    return value->c_str();
+    return value;
   }
   return this->LocalGenerator->GetFeature(feature, config);
 }
@@ -853,8 +853,8 @@ const char* cmGeneratorTarget::GetLinkPIEProperty(
 bool cmGeneratorTarget::IsIPOEnabled(std::string const& lang,
                                      std::string const& config) const
 {
-  const char* feature = "INTERPROCEDURAL_OPTIMIZATION";
-  const bool result = cmIsOn(this->GetFeature(feature, config));
+  cmProp feature = this->GetFeature("INTERPROCEDURAL_OPTIMIZATION", config);
+  const bool result = feature && cmIsOn(*feature);
 
   if (!result) {
     // 'INTERPROCEDURAL_OPTIMIZATION' is off, no need to check policies
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
@@ -175,8 +175,8 @@ class cmGeneratorTarget
 
   void ComputeObjectMapping();
 
-  const char* GetFeature(const std::string& feature,
-                         const std::string& config) const;
+  cmProp GetFeature(const std::string& feature,
+                    const std::string& config) const;
 
   const char* GetLinkPIEProperty(const std::string& config) const;
 
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -694,9 +694,8 @@ std::set<std::string> cmGlobalVisualStudio7Generator::IsPartOfDefaultBuild(
   }
   // inspect EXCLUDE_FROM_DEFAULT_BUILD[_<CONFIG>] properties
   for (std::string const& i : configs) {
-    const char* propertyValue =
-      target->GetFeature("EXCLUDE_FROM_DEFAULT_BUILD", i);
-    if (cmIsOff(propertyValue)) {
+    cmProp propertyValue = target->GetFeature("EXCLUDE_FROM_DEFAULT_BUILD", i);
+    if (!propertyValue || cmIsOff(*propertyValue)) {
       activeConfigs.insert(i);
     }
   }
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
@@ -3253,8 +3253,8 @@ void cmLocalGenerator::AppendFeatureOptions(std::string& flags,
   }
 }
 
-const char* cmLocalGenerator::GetFeature(const std::string& feature,
-                                         const std::string& config)
+cmProp cmLocalGenerator::GetFeature(const std::string& feature,
+                                    const std::string& config)
 {
   std::string featureName = feature;
   // TODO: Define accumulation policy for features (prepend, append,
@@ -3266,7 +3266,7 @@ const char* cmLocalGenerator::GetFeature(const std::string& feature,
   cmStateSnapshot snp = this->StateSnapshot;
   while (snp.IsValid()) {
     if (cmProp value = snp.GetDirectory().GetProperty(featureName)) {
-      return value->c_str();
+      return value;
     }
     snp = snp.GetBuildsystemDirectoryParent();
   }
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
@@ -20,6 +20,7 @@
 #include "cmMessageType.h"
 #include "cmOutputConverter.h"
 #include "cmPolicies.h"
+#include "cmProperty.h"
 #include "cmStateSnapshot.h"
 
 class cmComputeLinkInformation;
@@ -209,8 +210,7 @@ class cmLocalGenerator : public cmOutputConverter
   void AppendFeatureOptions(std::string& flags, const std::string& lang,
                             const char* feature);
 
-  const char* GetFeature(const std::string& feature,
-                         const std::string& config);
+  cmProp GetFeature(const std::string& feature, const std::string& config);
 
   /** \brief Get absolute path to dependency \a name
    *

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ std::vector<std::string> const& cmCommonTargetGenerator::GetConfigNames() const`
`41`	`41`	`const char* cmCommonTargetGenerator::GetFeature(const std::string& feature,`
`42`	`42`	`const std::string& config)`
`43`	`43`	`{`
`44`		`- return this->GeneratorTarget->GetFeature(feature, config);`
	`44`	`+ return this->GeneratorTarget->GetFeature(feature, config)->c_str();`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`void cmCommonTargetGenerator::AddModuleDefinitionFlag(`
Original file line number	Diff line number	Diff line change
`@@ -815,18 +815,18 @@ void cmGeneratorTarget::ComputeObjectMapping()`
`815`	`815`	`}`
`816`	`816`	`}`
`817`	`817`
`818`		`-const char* cmGeneratorTarget::GetFeature(const std::string& feature,`
`819`		`- const std::string& config) const`
	`818`	`+cmProp cmGeneratorTarget::GetFeature(const std::string& feature,`
	`819`	`+ const std::string& config) const`
`820`	`820`	`{`
`821`	`821`	`if (!config.empty()) {`
`822`	`822`	`std::string featureConfig =`
`823`	`823`	`cmStrCat(feature, '_', cmSystemTools::UpperCase(config));`
`824`	`824`	`if (cmProp value = this->GetProperty(featureConfig)) {`
`825`		`- return value->c_str();`
	`825`	`+ return value;`
`826`	`826`	`}`
`827`	`827`	`}`
`828`	`828`	`if (cmProp value = this->GetProperty(feature)) {`
`829`		`- return value->c_str();`
	`829`	`+ return value;`
`830`	`830`	`}`
`831`	`831`	`return this->LocalGenerator->GetFeature(feature, config);`
`832`	`832`	`}`
`@@ -853,8 +853,8 @@ const char* cmGeneratorTarget::GetLinkPIEProperty(`
`853`	`853`	`bool cmGeneratorTarget::IsIPOEnabled(std::string const& lang,`
`854`	`854`	`std::string const& config) const`
`855`	`855`	`{`
`856`		`- const char* feature = "INTERPROCEDURAL_OPTIMIZATION";`
`857`		`- const bool result = cmIsOn(this->GetFeature(feature, config));`
	`856`	`+ cmProp feature = this->GetFeature("INTERPROCEDURAL_OPTIMIZATION", config);`
	`857`	`+ const bool result = feature && cmIsOn(*feature);`
`858`	`858`
`859`	`859`	`if (!result) {`
`860`	`860`	`// 'INTERPROCEDURAL_OPTIMIZATION' is off, no need to check policies`
Original file line number	Diff line number	Diff line change
`@@ -694,9 +694,8 @@ std::set<std::string> cmGlobalVisualStudio7Generator::IsPartOfDefaultBuild(`
`694`	`694`	`}`
`695`	`695`	`// inspect EXCLUDE_FROM_DEFAULT_BUILD[_<CONFIG>] properties`
`696`	`696`	`for (std::string const& i : configs) {`
`697`		`- const char* propertyValue =`
`698`		`- target->GetFeature("EXCLUDE_FROM_DEFAULT_BUILD", i);`
`699`		`- if (cmIsOff(propertyValue)) {`
	`697`	`+ cmProp propertyValue = target->GetFeature("EXCLUDE_FROM_DEFAULT_BUILD", i);`
	`698`	`+ if (!propertyValue \|\| cmIsOff(*propertyValue)) {`
`700`	`699`	`activeConfigs.insert(i);`
`701`	`700`	`}`
`702`	`701`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3253,8 +3253,8 @@ void cmLocalGenerator::AppendFeatureOptions(std::string& flags,`
`3253`	`3253`	`}`
`3254`	`3254`	`}`
`3255`	`3255`
`3256`		`-const char* cmLocalGenerator::GetFeature(const std::string& feature,`
`3257`		`- const std::string& config)`
	`3256`	`+cmProp cmLocalGenerator::GetFeature(const std::string& feature,`
	`3257`	`+ const std::string& config)`
`3258`	`3258`	`{`
`3259`	`3259`	`std::string featureName = feature;`
`3260`	`3260`	`// TODO: Define accumulation policy for features (prepend, append,`
`@@ -3266,7 +3266,7 @@ const char* cmLocalGenerator::GetFeature(const std::string& feature,`
`3266`	`3266`	`cmStateSnapshot snp = this->StateSnapshot;`
`3267`	`3267`	`while (snp.IsValid()) {`
`3268`	`3268`	`if (cmProp value = snp.GetDirectory().GetProperty(featureName)) {`
`3269`		`- return value->c_str();`
	`3269`	`+ return value;`
`3270`	`3270`	`}`
`3271`	`3271`	`snp = snp.GetBuildsystemDirectoryParent();`
`3272`	`3272`	`}`