[Cmake-commits] CMake branch, next, updated. v3.6.2-2467-gdb5b6bf

[Brad King]

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  db5b6bf630ddcee02f97bdf368440692250c8d34 (commit)
       via  69a613221109a2a5c77e0469a49a95291e3a841d (commit)
      from  a76645452f07c807260d975ffdbdeba605682d0f (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=db5b6bf630ddcee02f97bdf368440692250c8d34
commit db5b6bf630ddcee02f97bdf368440692250c8d34
Merge: a766454 69a6132
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Sep 26 09:01:50 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Sep 26 09:01:50 2016 -0400

    Merge topic 'CPackNSIS-per-component-install' into next
    
    69a61322 CPack/NSIS fix custom component install directory for the uninstaller


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=69a613221109a2a5c77e0469a49a95291e3a841d
commit 69a613221109a2a5c77e0469a49a95291e3a841d
Author:     Roman Wüger <office at wueger.at>
AuthorDate: Sat Sep 24 23:24:39 2016 +0200
Commit:     Roman Wüger <office at wueger.at>
CommitDate: Sat Sep 24 23:24:39 2016 +0200

    CPack/NSIS fix custom component install directory for the uninstaller

diff --git a/Source/CPack/cmCPackNSISGenerator.cxx b/Source/CPack/cmCPackNSISGenerator.cxx
index 168a437..b49da7f 100644
--- a/Source/CPack/cmCPackNSISGenerator.cxx
+++ b/Source/CPack/cmCPackNSISGenerator.cxx
@@ -75,10 +75,7 @@ int cmCPackNSISGenerator::PackageFiles()
     std::string fileN =
       cmSystemTools::RelativePath(toplevel.c_str(), it->c_str());
     if (!this->Components.empty()) {
-      const size_t pos = fileN.find('/');
-
-      // Strip off the component part of the path.
-      fileN = fileN.substr(pos + 1, std::string::npos);
+      const std::string::size_type pos = fileN.find('/');
 
       // Use the custom component install directory if we have one
       if (pos != std::string::npos) {
@@ -87,6 +84,9 @@ int cmCPackNSISGenerator::PackageFiles()
       } else {
         outputDir = CustomComponentInstallDirectory(fileN);
       }
+
+      // Strip off the component part of the path.
+      fileN = fileN.substr(pos + 1, std::string::npos);
     }
     std::replace(fileN.begin(), fileN.end(), '/', '\\');
 
@@ -122,7 +122,7 @@ int cmCPackNSISGenerator::PackageFiles()
     std::replace(fileN.begin(), fileN.end(), '/', '\\');
 
     const std::string componentOutputDir =
-      CustomComponentInstallDirectory(fileN);
+      CustomComponentInstallDirectory(componentName);
 
     dstr << "  RMDir \"" << componentOutputDir << "\\" << fileN << "\""
          << std::endl;

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

Summary of changes:
 Source/CPack/cmCPackNSISGenerator.cxx |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake