[Cmake-commits] CMake branch, next, updated. v2.8.9-877-g587a6f1
Stephen Kelly
steveire at gmail.com
Sat Sep 29 12:54:17 EDT 2012
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 587a6f14e94a4a66bcab7f0fda6f838e27b43b34 (commit)
via 4ad02332aad12bdda5ae3a091326856c2ff31b3e (commit)
via 50b1ea5bed3cfc1a4d8ff2dcb246af19691a4aff (commit)
via 19c3206bdc8640c35db79dcbf8dae58244196ca4 (commit)
via 9d462b22a3ae0e4e59f090cec01522abc58e8d8c (commit)
via daf88c36984894d46a7e8379d4d80fbc69e5198a (commit)
via 3172cde640f15855a5e5b4c9833128661e51b5c3 (commit)
from 9670d87405573b45a82c98b092f9412d8430023b (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=587a6f14e94a4a66bcab7f0fda6f838e27b43b34
commit 587a6f14e94a4a66bcab7f0fda6f838e27b43b34
Merge: 9670d87 4ad0233
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Sep 29 12:54:13 2012 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Sep 29 12:54:13 2012 -0400
Merge topic 'documentation-cleanup' into next
4ad0233 Remove period at the end of the check message.
50b1ea5 Fix minor typos.
19c3206 Remove unused parameter marker and the unused parameter.
9d462b2 Document that generator expressions can be used in target properties.
daf88c3 Fix punctuation in some variables documentation.
3172cde Fix the layout of the generator expression documentation.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4ad02332aad12bdda5ae3a091326856c2ff31b3e
commit 4ad02332aad12bdda5ae3a091326856c2ff31b3e
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Sep 21 08:50:03 2012 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Sep 29 18:44:41 2012 +0200
Remove period at the end of the check message.
Other messages don't have one.
diff --git a/Modules/CheckIncludeFiles.cmake b/Modules/CheckIncludeFiles.cmake
index 70ab9be..daf2dd0 100644
--- a/Modules/CheckIncludeFiles.cmake
+++ b/Modules/CheckIncludeFiles.cmake
@@ -71,7 +71,7 @@ macro(CHECK_INCLUDE_FILES INCLUDE VARIABLE)
"exist passed with the following output:\n"
"${OUTPUT}\n\n")
else()
- message(STATUS "Looking for ${_description} - not found.")
+ message(STATUS "Looking for ${_description} - not found")
set(${VARIABLE} "" CACHE INTERNAL "Have includes ${INCLUDE}")
file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
"Determining if files ${INCLUDE} "
diff --git a/Modules/CheckSymbolExists.cmake b/Modules/CheckSymbolExists.cmake
index 59b9942..5a8597f 100644
--- a/Modules/CheckSymbolExists.cmake
+++ b/Modules/CheckSymbolExists.cmake
@@ -89,7 +89,7 @@ macro(_CHECK_SYMBOL_EXISTS SOURCEFILE SYMBOL FILES VARIABLE)
"${OUTPUT}\nFile ${SOURCEFILE}:\n"
"${CMAKE_CONFIGURABLE_FILE_CONTENT}\n")
else()
- message(STATUS "Looking for ${SYMBOL} - not found.")
+ message(STATUS "Looking for ${SYMBOL} - not found")
set(${VARIABLE} "" CACHE INTERNAL "Have symbol ${SYMBOL}")
file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
"Determining if the ${SYMBOL} "
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=50b1ea5bed3cfc1a4d8ff2dcb246af19691a4aff
commit 50b1ea5bed3cfc1a4d8ff2dcb246af19691a4aff
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Sep 23 15:02:29 2012 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Sep 29 18:44:10 2012 +0200
Fix minor typos.
nothe -> note
than -> that
duplicat -> duplicate
directory -> directly
Wipe wipe -> Wipe
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index ac75933..f021d0c 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -893,7 +893,7 @@ bool cmGlobalGenerator::CheckALLOW_DUPLICATE_CUSTOM_TARGETS()
<< "The \"" << this->GetName() << "\" generator does not support "
<< "duplicate custom targets. "
<< "Consider using a Makefiles generator or fix the project to not "
- << "use duplicat target names.";
+ << "use duplicate target names.";
cmSystemTools::Error(e.str().c_str());
return false;
}
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index ad9b5e1..bb88f07 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -2301,7 +2301,7 @@ void cmTarget::Emit(const LibraryID lib,
// be preserved.
// This variable will keep track of the libraries that were
- // emitted directory from the current node, and not from a
+ // emitted directly from the current node, and not from a
// recursive call. This way, if we come across a library that
// has already been emitted, we repeat it iff it has been
// emitted here.
@@ -2419,7 +2419,7 @@ void cmTarget::AppendProperty(const char* prop, const char* value,
//----------------------------------------------------------------------------
void cmTarget::MaybeInvalidatePropertyCache(const char* prop)
{
- // Wipe wipe out maps caching information affected by this property.
+ // Wipe out maps caching information affected by this property.
if(this->IsImported() && strncmp(prop, "IMPORTED", 8) == 0)
{
this->Internal->ImportInfoMap.clear();
diff --git a/Source/cmTargetLinkLibrariesCommand.cxx b/Source/cmTargetLinkLibrariesCommand.cxx
index dbea1c3..f42b0f6 100644
--- a/Source/cmTargetLinkLibrariesCommand.cxx
+++ b/Source/cmTargetLinkLibrariesCommand.cxx
@@ -108,8 +108,8 @@ bool cmTargetLinkLibrariesCommand
// specification if the keyword is encountered as the first argument.
this->CurrentProcessingState = ProcessingLinkLibraries;
- // add libraries, nothe that there is an optional prefix
- // of debug and optimized than can be used
+ // add libraries, note that there is an optional prefix
+ // of debug and optimized that can be used
for(unsigned int i=1; i < args.size(); ++i)
{
if(args[i] == "LINK_INTERFACE_LIBRARIES")
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=19c3206bdc8640c35db79dcbf8dae58244196ca4
commit 19c3206bdc8640c35db79dcbf8dae58244196ca4
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Sep 29 18:32:21 2012 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Sep 29 18:42:56 2012 +0200
Remove unused parameter marker and the unused parameter.
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 0a97910..ad9b5e1 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -2020,9 +2020,8 @@ bool cmTarget::NameResolvesToFramework(const std::string& libname)
}
//----------------------------------------------------------------------------
-bool cmTarget::AddFramework(const std::string& libname, LinkLibraryType llt)
+bool cmTarget::AddFramework(const std::string& libname, LinkLibraryType)
{
- (void)llt; // TODO: What is this?
if(this->NameResolvesToFramework(libname.c_str()))
{
std::string frameworkDir = libname;
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9d462b22a3ae0e4e59f090cec01522abc58e8d8c
commit 9d462b22a3ae0e4e59f090cec01522abc58e8d8c
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Sep 29 18:31:47 2012 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Sep 29 18:42:56 2012 +0200
Document that generator expressions can be used in target properties.
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 532d482..0a97910 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -16,6 +16,7 @@
#include "cmLocalGenerator.h"
#include "cmGlobalGenerator.h"
#include "cmDocumentCompileDefinitions.h"
+#include "cmDocumentGeneratorExpressions.h"
#include "cmDocumentLocationUndefined.h"
#include "cmListFileCache.h"
#include "cmGeneratorExpression.h"
@@ -204,6 +205,9 @@ void cmTarget::DefineProperties(cmake *cm)
"are not supported by the native build tool. "
"The VS6 IDE does not support definition values with spaces "
"(but NMake does).\n"
+ "Contents of COMPILE_DEFINITIONS may use \"generator expressions\" with "
+ "the syntax \"$<...>\". "
+ CM_DOCUMENT_COMMAND_GENERATOR_EXPRESSIONS
CM_DOCUMENT_COMPILE_DEFINITIONS_DISCLAIMER);
cm->DefineProperty
@@ -497,8 +501,11 @@ void cmTarget::DefineProperties(cmake *cm)
"to the include_directories command."
"\n"
"The target property values are used by the generators to set "
- "the include paths for the compiler. "
- "See also the include_directories command.");
+ "the include paths for the compiler. "
+ "See also the include_directories command.\n"
+ "Contents of INCLUDE_DIRECTORIES may use \"generator expressions\" with "
+ "the syntax \"$<...>\". "
+ CM_DOCUMENT_COMMAND_GENERATOR_EXPRESSIONS);
cm->DefineProperty
("INSTALL_NAME_DIR", cmProperty::TARGET,
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=daf88c36984894d46a7e8379d4d80fbc69e5198a
commit daf88c36984894d46a7e8379d4d80fbc69e5198a
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Sep 29 18:30:49 2012 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Sep 29 18:42:56 2012 +0200
Fix punctuation in some variables documentation.
diff --git a/Source/cmDocumentVariables.cxx b/Source/cmDocumentVariables.cxx
index 5e7e081..fb4e365 100644
--- a/Source/cmDocumentVariables.cxx
+++ b/Source/cmDocumentVariables.cxx
@@ -701,7 +701,8 @@ void cmDocumentVariables::DefineVariables(cmake* cm)
cm->DefineProperty
("CMAKE_SYSTEM_IGNORE_PATH", cmProperty::VARIABLE,
"Path to be ignored by FIND_XXX() commands.",
- "Specifies directories to be ignored by searches in FIND_XXX() commands "
+ "Specifies directories to be ignored by searches in FIND_XXX() "
+ "commands. "
"This is useful in cross-compiled environments where some system "
"directories contain incompatible but possibly linkable libraries. For "
"example, on cross-compiled cluster environments, this allows a user to "
@@ -716,7 +717,8 @@ void cmDocumentVariables::DefineVariables(cmake* cm)
cm->DefineProperty
("CMAKE_IGNORE_PATH", cmProperty::VARIABLE,
"Path to be ignored by FIND_XXX() commands.",
- "Specifies directories to be ignored by searches in FIND_XXX() commands "
+ "Specifies directories to be ignored by searches in FIND_XXX() "
+ "commands. "
"This is useful in cross-compiled environments where some system "
"directories contain incompatible but possibly linkable libraries. For "
"example, on cross-compiled cluster environments, this allows a user to "
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3172cde640f15855a5e5b4c9833128661e51b5c3
commit 3172cde640f15855a5e5b4c9833128661e51b5c3
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Sep 29 18:29:23 2012 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Sep 29 18:42:55 2012 +0200
Fix the layout of the generator expression documentation.
diff --git a/Source/cmDocumentGeneratorExpressions.h b/Source/cmDocumentGeneratorExpressions.h
index 6b0cf49..445fd0e 100644
--- a/Source/cmDocumentGeneratorExpressions.h
+++ b/Source/cmDocumentGeneratorExpressions.h
@@ -35,18 +35,20 @@
" $<TARGET_FILE_DIR:tgt>/$<TARGET_FILE_NAME:tgt>\n" \
" $<TARGET_LINKER_FILE_DIR:tgt>/$<TARGET_LINKER_FILE_NAME:tgt>\n" \
" $<TARGET_SONAME_FILE_DIR:tgt>/$<TARGET_SONAME_FILE_NAME:tgt>\n" \
+ "\n" \
" $<TARGET_PROPERTY:tgt,prop> = The value of the property prop\n" \
- "the target tgt. Note that tgt is not added as a dependency of the " \
- "target this expression is evaluated on.\n" \
+ "on the target tgt. Note that tgt is not added as a dependency of\n" \
+ "the target this expression is evaluated on.\n" \
"Boolean expressions:\n" \
" $<AND:?[,?]...> = '1' if all '?' are '1', else '0'\n" \
" $<OR:?[,?]...> = '0' if all '?' are '0', else '1'\n" \
" $<NOT:?> = '0' if '?' is '1', else '1'\n" \
"where '?' is always either '0' or '1'.\n" \
+ ""
#define CM_DOCUMENT_COMMAND_GENERATOR_EXPRESSIONS \
CM_DOCUMENT_ADD_TEST_GENERATOR_EXPRESSIONS \
- "Expressions with an implicit 'this' target:" \
+ "Expressions with an implicit 'this' target:\n" \
" $<TARGET_PROPERTY:prop> = The value of the property prop on\n" \
"the target on which the generator expression is evaluated.\n" \
""
-----------------------------------------------------------------------
Summary of changes:
Modules/CheckIncludeFiles.cmake | 2 +-
Modules/CheckSymbolExists.cmake | 2 +-
Source/cmDocumentGeneratorExpressions.h | 8 +++++---
Source/cmDocumentVariables.cxx | 6 ++++--
Source/cmGlobalGenerator.cxx | 2 +-
Source/cmTarget.cxx | 18 ++++++++++++------
Source/cmTargetLinkLibrariesCommand.cxx | 4 ++--
7 files changed, 26 insertions(+), 16 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list