[Cmake-commits] CMake branch, next, updated. v2.8.7-1944-g835d6f3

Eric Noulard eric.noulard at gmail.com
Tue Jan 3 12:04:59 EST 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  835d6f3e2d8fea1d1c7f4179f362235d1e5d4d8d (commit)
       via  d2c9626d5a2859a410dfed32fd1d55e1d386562c (commit)
      from  8bceb01217b735dc924a251cab8ea7ece47eab29 (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=835d6f3e2d8fea1d1c7f4179f362235d1e5d4d8d
commit 835d6f3e2d8fea1d1c7f4179f362235d1e5d4d8d
Merge: 8bceb01 d2c9626
Author:     Eric Noulard <eric.noulard at gmail.com>
AuthorDate: Tue Jan 3 12:04:56 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 3 12:04:56 2012 -0500

    Merge topic 'ImproveCPackDoc-part1' into next
    
    d2c9626 Document undocumented (but existing) cpack options (fix #0010134)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d2c9626d5a2859a410dfed32fd1d55e1d386562c
commit d2c9626d5a2859a410dfed32fd1d55e1d386562c
Author:     Eric NOULARD <eric.noulard at gmail.com>
AuthorDate: Sat Nov 5 14:41:23 2011 +0100
Commit:     Eric NOULARD <eric.noulard at gmail.com>
CommitDate: Tue Jan 3 16:47:35 2012 +0100

    Document undocumented (but existing) cpack options (fix #0010134)

diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx
index b1706e3..163f744 100644
--- a/Source/CPack/cpack.cxx
+++ b/Source/CPack/cpack.cxx
@@ -71,6 +71,25 @@ static const char * cmDocumentationOptions[][3] =
     {"--config <config file>", "Specify the config file.",
     "Specify the config file to use to create the package. By default "
       "CPackConfig.cmake in the current directory will be used." },
+    {"--verbose,-V","enable verbose output","Run cpack with verbose output."},
+    {"--debug","enable debug output (for CPack developers)",
+     "Run cpack with debug output (for CPack developers)."},
+    {"-P <package name>","override/define CPACK_PACKAGE_NAME",
+     "If the package name is not specified on cpack commmand line then"
+     "CPack.cmake defines it as CMAKE_PROJECT_NAME"},
+    {"-R <package version>","override/define CPACK_PACKAGE_VERSION",
+     "If version is not specified on cpack command line then"
+     "CPack.cmake defines it from CPACK_PACKAGE_VERSION_[MAJOR|MINOR|PATCH]"
+     "look into CPack.cmake for detail"},
+    {"-B <package directory>","override/define CPACK_PACKAGE_DIRECTORY",
+     "The directory where CPack will be doing its packaging work."
+     "The resulting package will be found there. Inside this directory"
+     "CPack creates '_CPack_Packages' sub-directory which is the"
+     "CPack temporary directory."},
+    {"--vendor <vendor name>","override/define CPACK_PACKAGE_VENDOR",
+     "If vendor is not specified on cpack command line "
+     "(or inside CMakeLists.txt) then"
+     "CPack.cmake defines it with a default value"},
     {0,0,0}
 };
 
@@ -440,6 +459,10 @@ int main (int argc, char *argv[])
       }
     }
 
+  /* In this case we are building the documentation object
+   * instance in order to create appropriate structure
+   * in order to satisfy the appropriate --help-xxx request
+   */
   if ( help )
     {
     doc.CheckOptions(argc, argv);

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

Summary of changes:
 Source/CPack/cpack.cxx |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list