kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'cleanup-properties' 

b78bc33 Cleanup some variable documentation names
bbfff52 Remove redundant cmake::GetIsPropertyDefined method
This commit is contained in:
Brad King 2013-10-07 15:43:55 -04:00 committed by CMake Topic Stage
parent ca2c627b39 b78bc33311
commit e00089388c
4 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/cmDocumentVariables.cxx
View File

@ -428,7 +428,7 @@ void cmDocumentVariables::DefineVariables(cmake* cm)
"PROJECT command.",false, "PROJECT command.",false,
"Variables that Provide Information"); "Variables that Provide Information");
cm->DefineProperty cm->DefineProperty
("[Project name]_BINARY_DIR", cmProperty::VARIABLE, ("<PROJECT-NAME>_BINARY_DIR", cmProperty::VARIABLE,
"Top level binary directory for the named project.", "Top level binary directory for the named project.",
"A variable is created with the name used in the PROJECT " "A variable is created with the name used in the PROJECT "
"command, and is the binary directory for the project. " "command, and is the binary directory for the project. "
@ -436,7 +436,7 @@ void cmDocumentVariables::DefineVariables(cmake* cm)
"several projects.",false, "several projects.",false,
"Variables that Provide Information"); "Variables that Provide Information");
cm->DefineProperty cm->DefineProperty
("[Project name]_SOURCE_DIR", cmProperty::VARIABLE, ("<PROJECT-NAME>_SOURCE_DIR", cmProperty::VARIABLE,
"Top level source directory for the named project.", "Top level source directory for the named project.",
"A variable is created with the name used in the PROJECT " "A variable is created with the name used in the PROJECT "
"command, and is the source directory for 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, "On most compilers this is \"-L\".",false,
"Variables that Control the Build"); "Variables that Control the Build");
cm->DefineProperty 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.", "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 " "The flag will be used to add a .def file when creating "
"a dll on Windows; this is only defined on Windows." "a dll on Windows; this is only defined on Windows."
@ -1861,7 +1861,7 @@ void cmDocumentVariables::DefineVariables(cmake* cm)
"Variables for Languages"); "Variables for Languages");
cm->DefineProperty 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.",
"Rule variable to link an executable for the given language." "Rule variable to link an executable for the given language."
,false, ,false,
@ -1948,8 +1948,6 @@ void cmDocumentVariables::DefineVariables(cmake* cm)
cmProperty::VARIABLE,0,0); cmProperty::VARIABLE,0,0);
cm->DefineProperty("CMAKE_<LANG>_INFORMATION_LOADED", cm->DefineProperty("CMAKE_<LANG>_INFORMATION_LOADED",
cmProperty::VARIABLE,0,0); cmProperty::VARIABLE,0,0);
cm->DefineProperty("CMAKE_<LANG>_LINK_EXECUTABLE",
cmProperty::VARIABLE,0,0);
cm->DefineProperty("CMAKE_<LANG>_LINK_FLAGS", cm->DefineProperty("CMAKE_<LANG>_LINK_FLAGS",
cmProperty::VARIABLE,0,0); cmProperty::VARIABLE,0,0);
cm->DefineProperty("CMAKE_<LANG>_RESPONSE_FILE_LINK_FLAG", cm->DefineProperty("CMAKE_<LANG>_RESPONSE_FILE_LINK_FLAG",

2
Source/cmTarget.cxx
View File

@ -6855,7 +6855,7 @@ void checkPropertyConsistency(cmTarget *depender, cmTarget *dependee,
pi != props.end(); ++pi) pi != props.end(); ++pi)
{ {
if (depender->GetMakefile()->GetCMakeInstance() if (depender->GetMakefile()->GetCMakeInstance()
->GetIsPropertyDefined(pi->c_str(), ->IsPropertyDefined(pi->c_str(),
cmProperty::TARGET)) cmProperty::TARGET))
{ {
cmOStringStream e; cmOStringStream e;

7
Source/cmake.cxx
View File

@ -3640,13 +3640,6 @@ void cmake::DefineProperty(const char *name, cmProperty::ScopeType scope,
chained); chained);
} }
bool cmake::GetIsPropertyDefined(const char *name,
cmProperty::ScopeType scope)
{
return this->PropertyDefinitions[scope].find(name) !=
this->PropertyDefinitions[scope].end();
}
cmPropertyDefinition *cmake cmPropertyDefinition *cmake
::GetPropertyDefinition(const char *name, ::GetPropertyDefinition(const char *name,
cmProperty::ScopeType scope) cmProperty::ScopeType scope)

2
Source/cmake.h
View File

@ -349,8 +349,6 @@ class cmake
bool chain = false, bool chain = false,
const char *variableGroup = 0); const char *variableGroup = 0);
bool GetIsPropertyDefined(const char *name, cmProperty::ScopeType scope);
// get property definition // get property definition
cmPropertyDefinition *GetPropertyDefinition cmPropertyDefinition *GetPropertyDefinition
(const char *name, cmProperty::ScopeType scope); (const char *name, cmProperty::ScopeType scope);