From bbfff5233d3c26a7049084dce330fc9b7983691f Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 17 Sep 2013 09:02:55 -0400 Subject: [PATCH 1/2] Remove redundant cmake::GetIsPropertyDefined method We already have cmake::IsPropertyDefined for the same reason. --- Source/cmTarget.cxx | 2 +- Source/cmake.cxx | 7 ------- Source/cmake.h | 2 -- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index ce0d0f20d..309ff4c3d 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -6823,7 +6823,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 290aff05c..6bd398e32 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 a50c1ed02..a3872d701 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); From b78bc33311f02ed36aac8ee2c3c79f0a6810e3d1 Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 17 Sep 2013 09:10:58 -0400 Subject: [PATCH 2/2] Cleanup some variable documentation names Remove trailing whitespace after property names. Remove duplicate CMAKE__LINK_EXECUTABLE definition. Rename "[Project name]" placeholder to "". --- Source/cmDocumentVariables.cxx | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Source/cmDocumentVariables.cxx b/Source/cmDocumentVariables.cxx index c4f6216b6..40a9db141 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, + ("_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, + ("_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." @@ -1853,7 +1853,7 @@ void cmDocumentVariables::DefineVariables(cmake* cm) "Variables for Languages"); cm->DefineProperty - ("CMAKE__LINK_EXECUTABLE ", cmProperty::VARIABLE, + ("CMAKE__LINK_EXECUTABLE", cmProperty::VARIABLE, "Rule variable to link an executable.", "Rule variable to link an executable for the given language." ,false, @@ -1940,8 +1940,6 @@ void cmDocumentVariables::DefineVariables(cmake* cm) cmProperty::VARIABLE,0,0); cm->DefineProperty("CMAKE__INFORMATION_LOADED", cmProperty::VARIABLE,0,0); - cm->DefineProperty("CMAKE__LINK_EXECUTABLE", - cmProperty::VARIABLE,0,0); cm->DefineProperty("CMAKE__LINK_FLAGS", cmProperty::VARIABLE,0,0); cm->DefineProperty("CMAKE__RESPONSE_FILE_LINK_FLAG",