[Cmake-commits] CMake branch, next, updated. v3.2.1-1245-gadfa972

[Clinton Stimpson]

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  adfa97275e880a785d9611a60af9df9591fe4af0 (commit)
       via  7fea419624386df1d36688f687725b5624de5db8 (commit)
      from  f19528014b75129c08d5749239c86b2ceabaa6b7 (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=adfa97275e880a785d9611a60af9df9591fe4af0
commit adfa97275e880a785d9611a60af9df9591fe4af0
Merge: f195280 7fea419
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Fri Mar 27 00:06:11 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Mar 27 00:06:11 2015 -0400

    Merge topic 'cpack-archive-prefix' into next
    
    7fea4196 Fix KWStyle test failure.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7fea419624386df1d36688f687725b5624de5db8
commit 7fea419624386df1d36688f687725b5624de5db8
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Thu Mar 26 22:05:41 2015 -0600
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Thu Mar 26 22:05:41 2015 -0600

    Fix KWStyle test failure.

diff --git a/Source/CPack/cmCPackArchiveGenerator.cxx b/Source/CPack/cmCPackArchiveGenerator.cxx
index b42a35e..05b5cd9 100644
--- a/Source/CPack/cmCPackArchiveGenerator.cxx
+++ b/Source/CPack/cmCPackArchiveGenerator.cxx
@@ -63,7 +63,8 @@ int cmCPackArchiveGenerator::addOneComponentToArchive(cmArchiveWrite& archive,
     filePrefix = this->GetOption("CPACK_PACKAGE_FILE_NAME");
     filePrefix += "/";
     }
-  const char* installPrefix = this->GetOption("CPACK_PACKAGING_INSTALL_PREFIX");
+  const char* installPrefix =
+    this->GetOption("CPACK_PACKAGING_INSTALL_PREFIX");
   if(installPrefix && installPrefix[0] == '/' && installPrefix[1] != 0)
     {
     // add to file prefix and remove the leading '/'

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

Summary of changes:
 Source/CPack/cmCPackArchiveGenerator.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake