[Cmake-commits] CMake branch, next, updated. v3.0.0-4781-g9f19254

[Bill Hoffman]

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  9f192548e1f7d046b25927469f351ad8542568f8 (commit)
       via  2cac483e64835329e4eec2d2fad5001895d0e7fe (commit)
      from  ca5ec0de3af93edcbaf5b79026b57fadf16bd123 (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=9f192548e1f7d046b25927469f351ad8542568f8
commit 9f192548e1f7d046b25927469f351ad8542568f8
Merge: ca5ec0d 2cac483
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Tue Aug 5 10:28:01 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Aug 5 10:28:01 2014 -0400

    Merge topic 'fix_value_not_used' into next
    
    2cac483e Fix used value warning.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2cac483e64835329e4eec2d2fad5001895d0e7fe
commit 2cac483e64835329e4eec2d2fad5001895d0e7fe
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Tue Aug 5 10:22:36 2014 -0400
Commit:     Bill Hoffman <bill.hoffman at kitware.com>
CommitDate: Tue Aug 5 10:22:36 2014 -0400

    Fix used value warning.
    
    packageFileName no longer has only one value in this function.  Move the
    declaration into the loop and remove its initial and unused asignment.

diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx
index 9336bed..1461bb1 100644
--- a/Source/CPack/cmCPackGenerator.cxx
+++ b/Source/CPack/cmCPackGenerator.cxx
@@ -1049,7 +1049,6 @@ int cmCPackGenerator::DoPackage()
 
   const char* tempPackageFileName = this->GetOption(
     "CPACK_TEMPORARY_PACKAGE_FILE_NAME");
-  const char* packageFileName = this->GetOption("CPACK_OUTPUT_FILE_PATH");
   const char* tempDirectory = this->GetOption("CPACK_TEMPORARY_DIRECTORY");
 
   cmCPackLogger(cmCPackLog::LOG_DEBUG, "Find files" << std::endl);
@@ -1114,7 +1113,7 @@ int cmCPackGenerator::DoPackage()
     std::string tmpPF(this->GetOption("CPACK_OUTPUT_FILE_PREFIX"));
     tempPackageFileName = it->c_str();
     tmpPF += "/"+cmSystemTools::GetFilenameName(*it);
-    packageFileName = tmpPF.c_str();
+    const char* packageFileName = tmpPF.c_str();
     cmCPackLogger(cmCPackLog::LOG_DEBUG, "Copy final package(s): "
         << (tempPackageFileName ? tempPackageFileName : "(NULL)" )
         << " to "

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

Summary of changes:
 Source/CPack/cmCPackGenerator.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)


hooks/post-receive
-- 
CMake