[Cmake-commits] CMake branch, next, updated. v2.8.8-2646-g86f0f29

[Brad King]

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  86f0f29eb9b1bbcbaf1875b42489a550195bd84c (commit)
       via  5ed93db4cf6408c245d58a1bfaa63048bc54fc00 (commit)
      from  5beb676f3159b436a03b9137eb3b5e6d1c09d62d (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=86f0f29eb9b1bbcbaf1875b42489a550195bd84c
commit 86f0f29eb9b1bbcbaf1875b42489a550195bd84c
Merge: 5beb676 5ed93db
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 19 09:43:54 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Apr 19 09:43:54 2012 -0400

    Merge topic 'doc-find_package-variables' into next
    
    5ed93db find_package: Fix components signature documentation (#13142)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5ed93db4cf6408c245d58a1bfaa63048bc54fc00
commit 5ed93db4cf6408c245d58a1bfaa63048bc54fc00
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Apr 18 13:28:45 2012 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Apr 19 09:41:17 2012 -0400

    find_package: Fix components signature documentation (#13142)
    
    Update the signature notation to show that "REQUIRED COMPONENTS ..." is
    allowed and that REQUIRED is an option on its own.

diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index 0a055a2..4f9ba7e 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -89,7 +89,7 @@ void cmFindPackageCommand::GenerateDocumentation()
                                "FIND_XXX", "find_package");
   this->CommandDocumentation =
     "  find_package(<package> [version] [EXACT] [QUIET] [MODULE]\n"
-    "               [[REQUIRED|COMPONENTS] [components...]]\n"
+    "               [REQUIRED] [[COMPONENTS] [components...]]\n"
     "               [OPTIONAL_COMPONENTS components...]\n"
     "               [NO_POLICY_SCOPE])\n"
     "Finds and loads settings from an external project.  "
@@ -102,7 +102,7 @@ void cmFindPackageCommand::GenerateDocumentation()
     "package cannot be found."
     "\n"
     "A package-specific list of required components may be listed after the "
-    "COMPONENTS option or directly after the REQUIRED option.  "
+    "COMPONENTS option (or after the REQUIRED option if present).  "
     "Additional optional components may be listed after OPTIONAL_COMPONENTS.  "
     "Available components and their influence on whether a package is "
     "considered to be found are defined by the target package."
@@ -136,7 +136,7 @@ void cmFindPackageCommand::GenerateDocumentation()
     "proceeds to Config mode.\n"
     "The complete Config mode command signature is:\n"
     "  find_package(<package> [version] [EXACT] [QUIET]\n"
-    "               [[REQUIRED|COMPONENTS] [components...]]\n"
+    "               [REQUIRED] [[COMPONENTS] [components...]]\n"
     "               [CONFIG|NO_MODULE]\n"
     "               [NO_POLICY_SCOPE]\n"
     "               [NAMES name1 [name2 ...]]\n"

-----------------------------------------------------------------------

Summary of changes:
 Source/cmFindPackageCommand.cxx |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake