[Cmake-commits] CMake branch, next, updated. v3.6.0-902-g6a43e55

[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  6a43e55d6d563ec65fe1ba8a4aa83c0f187be6b2 (commit)
       via  57534990d812c49bb2f71f5d36b19fa5e2c005a0 (commit)
      from  fe98d04da7cd71bfe820d2706f864e3bce42fc18 (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=6a43e55d6d563ec65fe1ba8a4aa83c0f187be6b2
commit 6a43e55d6d563ec65fe1ba8a4aa83c0f187be6b2
Merge: fe98d04 5753499
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 19 10:12:29 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jul 19 10:12:29 2016 -0400

    Merge topic 'compat-CPACK_INSTALL_CMAKE_PROJECTS-subdirectory' into next
    
    57534990 CPack: Add compatibility for incorrect CPACK_INSTALL_CMAKE_PROJECTS value

diff --cc Source/CPack/cmCPackGenerator.cxx
index 76609e1,f46d145..58a2243
--- a/Source/CPack/cmCPackGenerator.cxx
+++ b/Source/CPack/cmCPackGenerator.cxx
@@@ -624,9 -623,10 +624,10 @@@ int cmCPackGenerator::InstallProjectVia
          cm.AddCMakePaths();
          cm.SetProgressCallback(cmCPackGeneratorProgress, this);
          cmGlobalGenerator gg(&cm);
 -        cmsys::auto_ptr<cmMakefile> mf(
 +        CM_AUTO_PTR<cmMakefile> mf(
            new cmMakefile(&gg, cm.GetCurrentSnapshot()));
-         if (!installSubDirectory.empty() && installSubDirectory != "/") {
+         if (!installSubDirectory.empty() && installSubDirectory != "/" &&
+             installSubDirectory != ".") {
            tempInstallDirectory += installSubDirectory;
          }
          if (componentInstall) {

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=57534990d812c49bb2f71f5d36b19fa5e2c005a0
commit 57534990d812c49bb2f71f5d36b19fa5e2c005a0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 19 10:07:12 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jul 19 10:07:12 2016 -0400

    CPack: Add compatibility for incorrect CPACK_INSTALL_CMAKE_PROJECTS value
    
    Since commit v3.6.0-rc1~339^2 (CPack: Fix CPACK_INSTALL_CMAKE_PROJECTS
    SubDirectory (4th) option, 2016-02-18) we now honor the "Directory"
    option of this variable.  Prior to that commit the value was not used
    so projects may have used a placeholder value like `.` instead of `/`.
    Treat `.` the same as `/` to restore compatibility with such projects.
    
    Fixes #16205.

diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx
index c8b075d..f46d145 100644
--- a/Source/CPack/cmCPackGenerator.cxx
+++ b/Source/CPack/cmCPackGenerator.cxx
@@ -625,7 +625,8 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects(
         cmGlobalGenerator gg(&cm);
         cmsys::auto_ptr<cmMakefile> mf(
           new cmMakefile(&gg, cm.GetCurrentSnapshot()));
-        if (!installSubDirectory.empty() && installSubDirectory != "/") {
+        if (!installSubDirectory.empty() && installSubDirectory != "/" &&
+            installSubDirectory != ".") {
           tempInstallDirectory += installSubDirectory;
         }
         if (componentInstall) {

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

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


hooks/post-receive
-- 
CMake