[Cmake-commits] CMake branch, next, updated. v3.5.2-1327-g230dfa6
Brad King
brad.king at kitware.com
Wed May 11 09:39:39 EDT 2016
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 230dfa6e6a29db28405c73085194540a1b66b2b3 (commit)
via 276e287a5e394c90bf67703fa53dbda106e1baeb (commit)
from 04c05014d52f9599dcc296a0a096af8019173206 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=230dfa6e6a29db28405c73085194540a1b66b2b3
commit 230dfa6e6a29db28405c73085194540a1b66b2b3
Merge: 04c0501 276e287
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed May 11 09:39:38 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed May 11 09:39:38 2016 -0400
Merge topic 'cpack-deb-improvements' into next
276e287a fixup! CPack/Deb proper package file naming
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=276e287a5e394c90bf67703fa53dbda106e1baeb
commit 276e287a5e394c90bf67703fa53dbda106e1baeb
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed May 11 09:38:16 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed May 11 09:38:16 2016 -0400
fixup! CPack/Deb proper package file naming
diff --git a/Source/CPack/cmCPackDebGenerator.cxx b/Source/CPack/cmCPackDebGenerator.cxx
index 98b9724..24e06fe 100644
--- a/Source/CPack/cmCPackDebGenerator.cxx
+++ b/Source/CPack/cmCPackDebGenerator.cxx
@@ -247,8 +247,6 @@ int cmCPackDebGenerator::PackageComponentsAllInOne(
int cmCPackDebGenerator::PackageFiles()
{
- int retval = -1;
-
/* Are we in the component packaging case */
if (WantsComponentInstallation()) {
// CASE 1 : COMPONENT ALL-IN-ONE package
@@ -273,7 +271,6 @@ int cmCPackDebGenerator::PackageFiles()
{
return PackageComponentsAllInOne("");
}
- return retval;
}
int cmCPackDebGenerator::createDeb()
-----------------------------------------------------------------------
Summary of changes:
Source/CPack/cmCPackDebGenerator.cxx | 3 ---
1 file changed, 3 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list