Merge topic 'cleanup-properties'

b78bc33 Cleanup some variable documentation names
bbfff52 Remove redundant cmake::GetIsPropertyDefined method

4 files changed, 5 insertions, 16 deletions

diff --git a/Source/cmDocumentVariables.cxx b/Source/cmDocumentVariables.cxx
index 54f41af..fb2b3b9 100644
--- a/Source/cmDocumentVariables.cxx
+++ b/Source/cmDocumentVariables.cxx
@@ -428,7 +428,7 @@ void cmDocumentVariables::DefineVariables(cmake* cm)
      "PROJECT command.",false,
      "Variables that Provide Information");
   cm->DefineProperty
-    ("[Project name]_BINARY_DIR", cmProperty::VARIABLE,
+    ("<PROJECT-NAME>_BINARY_DIR", cmProperty::VARIABLE,
      "Top level binary directory for the named project.",
      "A variable is created with the name used in the PROJECT "
      "command, and is the binary directory for the project.  "
@@ -436,7 +436,7 @@ void cmDocumentVariables::DefineVariables(cmake* cm)
      "several projects.",false,
      "Variables that Provide Information");
   cm->DefineProperty
-    ("[Project name]_SOURCE_DIR", cmProperty::VARIABLE,
+    ("<PROJECT-NAME>_SOURCE_DIR", cmProperty::VARIABLE,
      "Top level source directory for the named project.",
      "A variable is created with the name used in the PROJECT "
      "command, and is the source directory for the project."
@@ -1477,7 +1477,7 @@ void cmDocumentVariables::DefineVariables(cmake* cm)
      "On most compilers this is \"-L\".",false,
      "Variables that Control the Build");
   cm->DefineProperty
-    ("CMAKE_LINK_DEF_FILE_FLAG  ", cmProperty::VARIABLE,
+    ("CMAKE_LINK_DEF_FILE_FLAG", cmProperty::VARIABLE,
      "Linker flag to be used to specify a .def file for dll creation.",
      "The flag will be used to add a .def file when creating "
      "a dll on Windows; this is only defined on Windows."
@@ -1861,7 +1861,7 @@ void cmDocumentVariables::DefineVariables(cmake* cm)
      "Variables for Languages");
 
   cm->DefineProperty
-    ("CMAKE_<LANG>_LINK_EXECUTABLE ", cmProperty::VARIABLE,
+    ("CMAKE_<LANG>_LINK_EXECUTABLE", cmProperty::VARIABLE,
      "Rule variable to link an executable.",
      "Rule variable to link an executable for the given language."
      ,false,
@@ -1948,8 +1948,6 @@ void cmDocumentVariables::DefineVariables(cmake* cm)
                      cmProperty::VARIABLE,0,0);
   cm->DefineProperty("CMAKE_<LANG>_INFORMATION_LOADED",
                      cmProperty::VARIABLE,0,0);
-  cm->DefineProperty("CMAKE_<LANG>_LINK_EXECUTABLE",
-                     cmProperty::VARIABLE,0,0);
   cm->DefineProperty("CMAKE_<LANG>_LINK_FLAGS",
                      cmProperty::VARIABLE,0,0);
   cm->DefineProperty("CMAKE_<LANG>_RESPONSE_FILE_LINK_FLAG",
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 7df599f..66f37b8 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -6855,7 +6855,7 @@ void checkPropertyConsistency(cmTarget *depender, cmTarget *dependee,
       pi != props.end(); ++pi)
     {
     if (depender->GetMakefile()->GetCMakeInstance()
-                      ->GetIsPropertyDefined(pi->c_str(),
+                      ->IsPropertyDefined(pi->c_str(),
                                               cmProperty::TARGET))
       {
       cmOStringStream e;
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 8b8cb01..267ce35 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -3640,13 +3640,6 @@ void cmake::DefineProperty(const char *name, cmProperty::ScopeType scope,
                                                   chained);
 }
 
-bool cmake::GetIsPropertyDefined(const char *name,
-                                 cmProperty::ScopeType scope)
-{
-  return this->PropertyDefinitions[scope].find(name) !=
-                                      this->PropertyDefinitions[scope].end();
-}
-
 cmPropertyDefinition *cmake
 ::GetPropertyDefinition(const char *name,
                         cmProperty::ScopeType scope)
diff --git a/Source/cmake.h b/Source/cmake.h
index a50c1ed..a3872d7 100644
--- a/Source/cmake.h
+++ b/Source/cmake.h
@@ -349,8 +349,6 @@ class cmake
                       bool chain = false,
                       const char *variableGroup = 0);
 
-  bool GetIsPropertyDefined(const char *name, cmProperty::ScopeType scope);
-
   // get property definition
   cmPropertyDefinition *GetPropertyDefinition
   (const char *name, cmProperty::ScopeType scope);