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 2682d39ef9a805ae2fe5ff14dae832018c2cb07c (commit)
via 926d634d3eba9b6a6d2043d44049ccd304e4ecac (commit)
via b689f8e928c638442e74246661e3c14fcb8c1ba4 (commit)
via c27c82a4e9af8d1c26f8a1fe0d4cfebd9d43cad1 (commit)
from 809e8c6954a42dcf12323df0f42c8f6f4eeb2091 (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=2682d39ef9a805ae2fe5ff14dae832018c2cb07c
commit 2682d39ef9a805ae2fe5ff14dae832018c2cb07c
Merge: 809e8c6 926d634
Author: Eric Noulard <eric.noul...@gmail.com>
AuthorDate: Tue Jul 3 09:32:32 2012 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Jul 3 09:32:32 2012 -0400
Merge topic 'CPack-fixRegressionCPackWithNoArgs' into next
926d634 CPack fix regression between 2.8.7 and 2.8.8 when running cpack
with no arg.
b689f8e CMake Nightly Date Stamp
c27c82a CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=926d634d3eba9b6a6d2043d44049ccd304e4ecac
commit 926d634d3eba9b6a6d2043d44049ccd304e4ecac
Author: Eric NOULARD <eric.noul...@gmail.com>
AuthorDate: Tue Jul 3 15:28:07 2012 +0200
Commit: Eric NOULARD <eric.noul...@gmail.com>
CommitDate: Tue Jul 3 15:28:07 2012 +0200
CPack fix regression between 2.8.7 and 2.8.8 when running cpack with no arg.
In 2.8.7 running cpack with no arguments would run the packaging iff
a CPackConfig.cmake file is found whereas
In 2.8.8 it displays the help.
This commit restore the 2.8.7.
We should add a test for this but this is not included in this commit.
diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx
index 6f5055c..20824b1 100644
--- a/Source/CPack/cpack.cxx
+++ b/Source/CPack/cpack.cxx
@@ -294,8 +294,12 @@ int main (int argc, char *argv[])
cmDocumentation doc;
doc.addCPackStandardDocSections();
- /* Were we invoked to display doc or to do some work ? */
- if(doc.CheckOptions(argc, argv,"-G") || nocwd)
+ /* Were we invoked to display doc or to do some work ?
+ * Unlike cmake launching cpack with zero argument
+ * should launch cpack using "cpackConfigFile" if it exists
+ * in the current directory.
+ */
+ if((doc.CheckOptions(argc, argv,"-G") || nocwd) && !(argc==1))
{
help = true;
}
-----------------------------------------------------------------------
Summary of changes:
Source/CMakeVersion.cmake | 2 +-
Source/CPack/cpack.cxx | 8 ++++++--
2 files changed, 7 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
