[Cmake-commits] CMake branch, next, updated. v2.8.11-2502-gba5789d
Stephen Kelly
steveire at gmail.com
Tue Jun 4 06:01:57 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 ba5789d8de124378c21a5dccea34953fb65b0dc3 (commit)
via 9efe35906af4447533d9e594df539e71293437dd (commit)
via db15713f057ad4896eab07f847870f5ab42f8be1 (commit)
from e784e79cd32755d240d3f56cf9d5fa150e7776b6 (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=ba5789d8de124378c21a5dccea34953fb65b0dc3
commit ba5789d8de124378c21a5dccea34953fb65b0dc3
Merge: e784e79 9efe359
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jun 4 06:01:55 2013 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jun 4 06:01:55 2013 -0400
Merge topic 'cleanups' into next
9efe359 Add some spaces to the INCLUDE_DIRECTORIES documentation.
db15713 Remove unused cmAddDefinitionsCommand::ParseDefinition method.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9efe35906af4447533d9e594df539e71293437dd
commit 9efe35906af4447533d9e594df539e71293437dd
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jun 4 11:30:23 2013 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Jun 4 12:00:41 2013 +0200
Add some spaces to the INCLUDE_DIRECTORIES documentation.
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 606ec93..e57ff88 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -3986,20 +3986,20 @@ void cmMakefile::DefineProperties(cmake *cm)
("INCLUDE_DIRECTORIES", cmProperty::DIRECTORY,
"List of preprocessor include file search directories.",
"This property specifies the list of directories given "
- "so far to the include_directories command. "
- "This property exists on directories and targets. "
+ "so far to the include_directories command. "
+ "This property exists on directories and targets. "
"In addition to accepting values from the include_directories "
"command, values may be set directly on any directory or any "
- "target using the set_property command. "
+ "target using the set_property command. "
"A target gets its initial value for this property from the value "
- "of the directory property. "
+ "of the directory property. "
"A directory gets its initial value from its parent directory if "
- "it has one. "
+ "it has one. "
"Both directory and target property values are adjusted by calls "
"to the include_directories command."
"\n"
"The target property values are used by the generators to set "
- "the include paths for the compiler. "
+ "the include paths for the compiler. "
"See also the include_directories command.");
cm->DefineProperty
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=db15713f057ad4896eab07f847870f5ab42f8be1
commit db15713f057ad4896eab07f847870f5ab42f8be1
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jun 4 02:50:10 2013 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Jun 4 12:00:32 2013 +0200
Remove unused cmAddDefinitionsCommand::ParseDefinition method.
diff --git a/Source/cmAddDefinitionsCommand.h b/Source/cmAddDefinitionsCommand.h
index 6705d11..ff2c4a0 100644
--- a/Source/cmAddDefinitionsCommand.h
+++ b/Source/cmAddDefinitionsCommand.h
@@ -73,8 +73,6 @@ public:
}
cmTypeMacro(cmAddDefinitionsCommand, cmCommand);
-private:
- bool ParseDefinition(std::string const& def);
};
-----------------------------------------------------------------------
Summary of changes:
Source/cmAddDefinitionsCommand.h | 2 --
Source/cmMakefile.cxx | 12 ++++++------
2 files changed, 6 insertions(+), 8 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list