[Cmake-commits] CMake branch, master, updated. v3.6.0-448-g6a98785

[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, master has been updated
       via  6a98785d8f76d78447716fa90f93a36060288b8f (commit)
       via  57534990d812c49bb2f71f5d36b19fa5e2c005a0 (commit)
      from  88ee36f93f2491a0e1220fd6bdc5018b85c10f24 (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=6a98785d8f76d78447716fa90f93a36060288b8f
commit 6a98785d8f76d78447716fa90f93a36060288b8f
Merge: 88ee36f 5753499
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 20 09:03:22 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jul 20 09:03:22 2016 -0400

    Merge topic 'compat-CPACK_INSTALL_CMAKE_PROJECTS-subdirectory'
    
    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) {

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

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


hooks/post-receive
-- 
CMake