diff options
| author | Brad King <brad.king@kitware.com> | 2014-05-09 15:46:54 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-05-09 15:46:54 (GMT) |
| commit | 39ae025842133edad83470d2713b9ae9a6306a53 (patch) | |
| tree | 66f0342306d147defd4cea0c307fc8b4e6e899b1 /Source/cmTarget.h | |
| parent | 890efcb6077d01629ca29f9f54c90a1f0663033a (diff) | |
| parent | 23409f50f13a337333021b458a42273464100eae (diff) | |
| download | CMake-39ae025842133edad83470d2713b9ae9a6306a53.zip CMake-39ae025842133edad83470d2713b9ae9a6306a53.tar.gz CMake-39ae025842133edad83470d2713b9ae9a6306a53.tar.bz2 | |
Merge branch 'backport-target-property-policy-context' into release
Diffstat (limited to 'Source/cmTarget.h')
| -rw-r--r-- | Source/cmTarget.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmTarget.h b/Source/cmTarget.h index 0e9d682..a305caa 100644 --- a/Source/cmTarget.h +++ b/Source/cmTarget.h @@ -257,7 +257,7 @@ public: 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 *GetProperty(const char *prop, cmProperty::ScopeType scope) const; + const char *GetProperty(const char *prop, cmMakefile* context) const; bool GetPropertyAsBool(const char *prop) const; void CheckProperty(const char* prop, cmMakefile* context) const; @@ -580,7 +580,7 @@ public: const std::string &compatibilityType) const; private: - bool HandleLocationPropertyPolicy() const; + bool HandleLocationPropertyPolicy(cmMakefile* context) const; // The set of include directories that are marked as system include // directories. |