summaryrefslogtreecommitdiffstats
path: root/Source/cmMakefile.h
diff options
context:
space:
mode:
authorBen Boeckel <ben.boeckel@kitware.com>2013-09-02 20:27:32 (GMT)
committerBrad King <brad.king@kitware.com>2014-03-08 18:05:28 (GMT)
commitec97ed7d0c67b635caf3ada65541b2eaf0818a93 (patch)
tree9b38ed2ca59f7da24dfc0db503d9e203ed265fb4 /Source/cmMakefile.h
parent2977330a7b27d21e2b6276d9386624b6811b9274 (diff)
downloadCMake-ec97ed7d0c67b635caf3ada65541b2eaf0818a93.zip
CMake-ec97ed7d0c67b635caf3ada65541b2eaf0818a93.tar.gz
CMake-ec97ed7d0c67b635caf3ada65541b2eaf0818a93.tar.bz2
stringapi: Use strings for property names
Property names are always generated by CMake and should never be NULL.
Diffstat (limited to 'Source/cmMakefile.h')
-rw-r--r--Source/cmMakefile.h16
1 files changed, 9 insertions, 7 deletions
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 45f3b9f..5f4b803 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -800,12 +800,14 @@ public:
std::string GetModulesFile(const char* name) const;
///! Set/Get a property of this directory
- void SetProperty(const char *prop, const char *value);
- void AppendProperty(const char *prop, const char *value,bool asString=false);
- const char *GetProperty(const char *prop) const;
- const char *GetPropertyOrDefinition(const char *prop) const;
- const char *GetProperty(const char *prop, cmProperty::ScopeType scope) const;
- bool GetPropertyAsBool(const char *prop) const;
+ void SetProperty(const std::string& prop, const char *value);
+ void AppendProperty(const std::string& prop, const char *value,
+ bool asString=false);
+ const char *GetProperty(const std::string& prop) const;
+ const char *GetPropertyOrDefinition(const std::string& prop) const;
+ const char *GetProperty(const std::string& prop,
+ cmProperty::ScopeType scope) const;
+ bool GetPropertyAsBool(const std::string& prop) const;
const char* GetFeature(const char* feature, const char* config);
@@ -835,7 +837,7 @@ public:
// push and pop variable scopes
void PushScope();
void PopScope();
- void RaiseScope(const char *var, const char *value);
+ void RaiseScope(const cmStdString& var, const char *value);
/** Helper class to push and pop scopes automatically. */
class ScopePushPop