[Cmake-commits] CMake branch, next, updated. v2.8.10.1-853-g27822c2

[Eric Noulard]

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  27822c26828dbc352e9368d40b1a3ce2edd85dcb (commit)
       via  b6f7881962e3905e8fda20340e6d9dcc7877da84 (commit)
      from  440c168e65b4965f8a92d409e5afd2ded0122365 (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=27822c26828dbc352e9368d40b1a3ce2edd85dcb
commit 27822c26828dbc352e9368d40b1a3ce2edd85dcb
Merge: 440c168 b6f7881
Author:     Eric Noulard <eric.noulard at gmail.com>
AuthorDate: Sun Nov 11 15:59:04 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Nov 11 15:59:04 2012 -0500

    Merge topic 'CPack-BugFixesSet' into next
    
    b6f7881 Remove seemingly bogus duplicate CPACK_PACKAGE_FILE_NAME call.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b6f7881962e3905e8fda20340e6d9dcc7877da84
commit b6f7881962e3905e8fda20340e6d9dcc7877da84
Author:     Andreas Mohr <andim2 at users.sourceforge.net>
AuthorDate: Sun Nov 11 21:54:35 2012 +0100
Commit:     Eric NOULARD <eric.noulard at gmail.com>
CommitDate: Sun Nov 11 21:54:35 2012 +0100

    Remove seemingly bogus duplicate CPACK_PACKAGE_FILE_NAME call.
    
    Signed-off-by: Eric NOULARD <eric.noulard at gmail.com>

diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx
index e964696..43ce81b 100644
--- a/Source/CPack/cmCPackGenerator.cxx
+++ b/Source/CPack/cmCPackGenerator.cxx
@@ -97,7 +97,6 @@ int cmCPackGenerator::PrepareNames()
     }
   tempDirectory += this->GetOption("CPACK_GENERATOR");
   std::string topDirectory = tempDirectory;
-  this->GetOption("CPACK_PACKAGE_FILE_NAME");
   const char* pfname = this->GetOption("CPACK_PACKAGE_FILE_NAME");
   if(!pfname)
     {

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

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


hooks/post-receive
-- 
CMake