[Cmake-commits] CMake branch, next, updated. v2.8.9-355-ged59e13

[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  ed59e13b0f44cfe482093a5b10548e11bf5ff06d (commit)
       via  f86bc21f4b899f0594fbcdef1bdd1a6bfa303465 (commit)
      from  b35b96f5dba805ea5e2369de55fbb54a1600c3df (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=ed59e13b0f44cfe482093a5b10548e11bf5ff06d
commit ed59e13b0f44cfe482093a5b10548e11bf5ff06d
Merge: b35b96f f86bc21
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Sep 4 15:09:30 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Sep 4 15:09:30 2012 -0400

    Merge topic 'cpack-stripping' into next
    
    f86bc21 Revert "Bug 0011785: DESTDIR is a dir but file could be a var without a leading slash"


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f86bc21f4b899f0594fbcdef1bdd1a6bfa303465
commit f86bc21f4b899f0594fbcdef1bdd1a6bfa303465
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Sep 4 15:08:27 2012 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Sep 4 15:08:27 2012 -0400

    Revert "Bug 0011785: DESTDIR is a dir but file could be a var without a leading slash"
    
    This reverts commit 7ad5598b3c0d0ffce5f4bedba9e77a191bb5780f.
    The fix is not correct.  Both DESTDIR and CMAKE_INSTALL_PREFIX
    should always be a full path.  When used together the latter
    always starts in a slash.  CPack should be fixed to not use a
    "relative" install prefix.

diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx
index 74011cc..5f9b658 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -455,11 +455,12 @@ std::string cmInstallTargetGenerator::GetDestDirPath(std::string const& file)
   // Construct the path of the file on disk after installation on
   // which tweaks may be performed.
   std::string toDestDirPath = "$ENV{DESTDIR}";
-  if(file[0] != '/')
+  if(file[0] != '/' && file[0] != '$')
     {
     toDestDirPath += "/";
     }
-  return toDestDirPath + file;
+  toDestDirPath += file;
+  return toDestDirPath;
 }
 
 //----------------------------------------------------------------------------

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

Summary of changes:
 Source/cmInstallTargetGenerator.cxx |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake