diff options
author | Bill Hoffman <bill.hoffman@kitware.com> | 2009-10-09 20:11:47 (GMT) |
---|---|---|
committer | Bill Hoffman <bill.hoffman@kitware.com> | 2009-10-09 20:11:47 (GMT) |
commit | ebd0c2d3771835a1317c1fd70eafd3ebf2135b01 (patch) | |
tree | 1dc8f5805b5f3f01933bc0035b3b6cad7b04b73a /Source/cmMakefile.h | |
parent | f9687e328f7ea64ea6384aae11af36fdd3a12643 (diff) | |
download | CMake-ebd0c2d3771835a1317c1fd70eafd3ebf2135b01.zip CMake-ebd0c2d3771835a1317c1fd70eafd3ebf2135b01.tar.gz CMake-ebd0c2d3771835a1317c1fd70eafd3ebf2135b01.tar.bz2 |
Merge in changes for RC 3
Diffstat (limited to 'Source/cmMakefile.h')
-rw-r--r-- | Source/cmMakefile.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h index 485d9e2..63f81b8 100644 --- a/Source/cmMakefile.h +++ b/Source/cmMakefile.h @@ -286,11 +286,6 @@ public: bool force = false); /** - * Update the variable scope to make the cache definition visible. - */ - void UseCacheDefinition(cmCacheManager::CacheIterator const& it); - - /** * Add bool variable definition to the build. */ void AddDefinition(const char* name, bool); @@ -793,6 +788,8 @@ public: const char *GetProperty(const char *prop, cmProperty::ScopeType scope); bool GetPropertyAsBool(const char *prop); + const char* GetFeature(const char* feature, const char* config); + // Get the properties cmPropertyMap &GetProperties() { return this->Properties; }; |