[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4216-gfa12c9b
Brad King
brad.king at kitware.com
Tue Sep 17 09:30:08 EDT 2013
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via fa12c9b0385c2035e40f0132eae6c3788a8774a3 (commit)
via b78bc33311f02ed36aac8ee2c3c79f0a6810e3d1 (commit)
via bbfff5233d3c26a7049084dce330fc9b7983691f (commit)
from bd62234747f0aba281a289cd3b9b166306ea043d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fa12c9b0385c2035e40f0132eae6c3788a8774a3
commit fa12c9b0385c2035e40f0132eae6c3788a8774a3
Merge: bd62234 b78bc33
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Sep 17 09:30:04 2013 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Sep 17 09:30:04 2013 -0400
Merge topic 'cleanup-properties' into next
b78bc33 Cleanup some variable documentation names
bbfff52 Remove redundant cmake::GetIsPropertyDefined method
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b78bc33311f02ed36aac8ee2c3c79f0a6810e3d1
commit b78bc33311f02ed36aac8ee2c3c79f0a6810e3d1
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Sep 17 09:10:58 2013 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Sep 17 09:10:58 2013 -0400
Cleanup some variable documentation names
Remove trailing whitespace after property names.
Remove duplicate CMAKE_<LANG>_LINK_EXECUTABLE definition.
Rename "[Project name]" placeholder to "<PROJECT-NAME>".
diff --git a/Source/cmDocumentVariables.cxx b/Source/cmDocumentVariables.cxx
index c4f6216..40a9db1 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."
@@ -1853,7 +1853,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,
@@ -1940,8 +1940,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",
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bbfff5233d3c26a7049084dce330fc9b7983691f
commit bbfff5233d3c26a7049084dce330fc9b7983691f
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Sep 17 09:02:55 2013 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Sep 17 09:10:31 2013 -0400
Remove redundant cmake::GetIsPropertyDefined method
We already have cmake::IsPropertyDefined for the same reason.
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index ce0d0f2..309ff4c 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 290aff0..6bd398e 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);
-----------------------------------------------------------------------
Summary of changes:
Source/cmDocumentVariables.cxx | 10 ++++------
Source/cmTarget.cxx | 2 +-
Source/cmake.cxx | 7 -------
Source/cmake.h | 2 --
4 files changed, 5 insertions(+), 16 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list