From 3172cde640f15855a5e5b4c9833128661e51b5c3 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Sat, 29 Sep 2012 18:29:23 +0200 Subject: [PATCH 1/6] Fix the layout of the generator expression documentation. --- Source/cmDocumentGeneratorExpressions.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Source/cmDocumentGeneratorExpressions.h b/Source/cmDocumentGeneratorExpressions.h index 6b0cf4914..445fd0e12 100644 --- a/Source/cmDocumentGeneratorExpressions.h +++ b/Source/cmDocumentGeneratorExpressions.h @@ -35,18 +35,20 @@ " $/$\n" \ " $/$\n" \ " $/$\n" \ + "\n" \ " $ = 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" \ " $ = '1' if all '?' are '1', else '0'\n" \ " $ = '0' if all '?' are '0', else '1'\n" \ " $ = '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" \ " $ = The value of the property prop on\n" \ "the target on which the generator expression is evaluated.\n" \ "" From daf88c36984894d46a7e8379d4d80fbc69e5198a Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Sat, 29 Sep 2012 18:30:49 +0200 Subject: [PATCH 2/6] Fix punctuation in some variables documentation. --- Source/cmDocumentVariables.cxx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Source/cmDocumentVariables.cxx b/Source/cmDocumentVariables.cxx index 5e7e081cf..fb4e3653e 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 " From 9d462b22a3ae0e4e59f090cec01522abc58e8d8c Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Sat, 29 Sep 2012 18:31:47 +0200 Subject: [PATCH 3/6] Document that generator expressions can be used in target properties. --- Source/cmTarget.cxx | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index 532d4828c..0a9791017 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, From 19c3206bdc8640c35db79dcbf8dae58244196ca4 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Sat, 29 Sep 2012 18:32:21 +0200 Subject: [PATCH 4/6] Remove unused parameter marker and the unused parameter. --- Source/cmTarget.cxx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index 0a9791017..ad9b5e106 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; From 50b1ea5bed3cfc1a4d8ff2dcb246af19691a4aff Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Sun, 23 Sep 2012 15:02:29 +0200 Subject: [PATCH 5/6] Fix minor typos. nothe -> note than -> that duplicat -> duplicate directory -> directly Wipe wipe -> Wipe --- Source/cmGlobalGenerator.cxx | 2 +- Source/cmTarget.cxx | 4 ++-- Source/cmTargetLinkLibrariesCommand.cxx | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index ac75933c2..f021d0c57 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 ad9b5e106..bb88f07ae 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 dbea1c3bb..f42b0f687 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") From 4ad02332aad12bdda5ae3a091326856c2ff31b3e Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Fri, 21 Sep 2012 08:50:03 +0200 Subject: [PATCH 6/6] Remove period at the end of the check message. Other messages don't have one. --- Modules/CheckIncludeFiles.cmake | 2 +- Modules/CheckSymbolExists.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Modules/CheckIncludeFiles.cmake b/Modules/CheckIncludeFiles.cmake index 70ab9be5b..daf2dd0ea 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 59b9942d6..5a8597f23 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} "