diff options
-rw-r--r-- | Source/cmPropertyDefinition.cxx | 13 | ||||
-rw-r--r-- | Source/cmPropertyDefinition.h | 9 | ||||
-rw-r--r-- | Source/cmPropertyDefinitionMap.cxx | 3 | ||||
-rw-r--r-- | Source/cmPropertyDefinitionMap.h | 1 | ||||
-rw-r--r-- | Source/cmake.cxx | 3 | ||||
-rw-r--r-- | Source/cmake.h | 3 |
6 files changed, 3 insertions, 29 deletions
diff --git a/Source/cmPropertyDefinition.cxx b/Source/cmPropertyDefinition.cxx index 3aa9e94..abc57ce 100644 --- a/Source/cmPropertyDefinition.cxx +++ b/Source/cmPropertyDefinition.cxx @@ -12,19 +12,10 @@ #include "cmPropertyDefinition.h" #include "cmSystemTools.h" -cmDocumentationEntry cmPropertyDefinition::GetDocumentation() const -{ - cmDocumentationEntry e; - e.Name = this->Name; - e.Brief = this->ShortDescription; - return e; -} - void cmPropertyDefinition ::DefineProperty(const char *name, cmProperty::ScopeType scope, const char *shortDescription, const char *fullDescription, - const char *sec, bool chain) { this->Name = name; @@ -38,9 +29,5 @@ void cmPropertyDefinition { this->FullDescription = fullDescription; } - if (sec) - { - this->DocumentationSection = sec; - } } diff --git a/Source/cmPropertyDefinition.h b/Source/cmPropertyDefinition.h index 296366d..1b6a7a6 100644 --- a/Source/cmPropertyDefinition.h +++ b/Source/cmPropertyDefinition.h @@ -30,22 +30,14 @@ public: void DefineProperty(const char *name, cmProperty::ScopeType scope, const char *ShortDescription, const char *FullDescription, - const char *DocumentationSection, bool chained); - /// Get the documentation string - cmDocumentationEntry GetDocumentation() const; - /// Default constructor cmPropertyDefinition() { this->Chained = false; }; /// Is the property chained? bool IsChained() const { return this->Chained; }; - /// Get the section if any - const std::string &GetDocumentationSection() const { - return this->DocumentationSection; }; - /// Get the scope cmProperty::ScopeType GetScope() const { return this->Scope; }; @@ -62,7 +54,6 @@ protected: std::string Name; std::string ShortDescription; std::string FullDescription; - std::string DocumentationSection; cmProperty::ScopeType Scope; bool Chained; }; diff --git a/Source/cmPropertyDefinitionMap.cxx b/Source/cmPropertyDefinitionMap.cxx index 22f8218..db29504 100644 --- a/Source/cmPropertyDefinitionMap.cxx +++ b/Source/cmPropertyDefinitionMap.cxx @@ -17,7 +17,6 @@ void cmPropertyDefinitionMap ::DefineProperty(const char *name, cmProperty::ScopeType scope, const char *ShortDescription, const char *FullDescription, - const char *DocumentationSection, bool chain) { if (!name) @@ -31,7 +30,7 @@ void cmPropertyDefinitionMap { prop = &(*this)[name]; prop->DefineProperty(name,scope,ShortDescription, FullDescription, - DocumentationSection, chain); + chain); } } diff --git a/Source/cmPropertyDefinitionMap.h b/Source/cmPropertyDefinitionMap.h index 1e569ad..736e243 100644 --- a/Source/cmPropertyDefinitionMap.h +++ b/Source/cmPropertyDefinitionMap.h @@ -24,7 +24,6 @@ public: void DefineProperty(const char *name, cmProperty::ScopeType scope, const char *ShortDescription, const char *FullDescription, - const char *DocumentaitonSection, bool chain); // has a named property been defined diff --git a/Source/cmake.cxx b/Source/cmake.cxx index 2e3c36d..d11a40b 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -2376,11 +2376,10 @@ void cmake::GenerateGraphViz(const char* fileName) const void cmake::DefineProperty(const char *name, cmProperty::ScopeType scope, const char *ShortDescription, const char *FullDescription, - bool chained, const char *docSection) + bool chained) { this->PropertyDefinitions[scope].DefineProperty(name,scope,ShortDescription, FullDescription, - docSection, chained); } diff --git a/Source/cmake.h b/Source/cmake.h index a5bef24..73e5109 100644 --- a/Source/cmake.h +++ b/Source/cmake.h @@ -330,8 +330,7 @@ class cmake void DefineProperty(const char *name, cmProperty::ScopeType scope, const char *ShortDescription, const char *FullDescription, - bool chain = false, - const char *variableGroup = 0); + bool chain = false); // get property definition cmPropertyDefinition *GetPropertyDefinition |