summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2010-09-28 18:02:44 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2010-09-28 18:02:44 (GMT)
commit126158f0461589a7d27901be3f8e8d2eaade4fa8 (patch)
treeb59bb7fa7a705e271dc1a540a105ed81f5a1b732
parentc0665ca79572215a6f00804ec5c75f598682d465 (diff)
parent225abc555de7499f4847e91de22523766541ce61 (diff)
downloadCMake-126158f0461589a7d27901be3f8e8d2eaade4fa8.zip
CMake-126158f0461589a7d27901be3f8e8d2eaade4fa8.tar.gz
CMake-126158f0461589a7d27901be3f8e8d2eaade4fa8.tar.bz2
Merge topic 'fixAbsoluteDestHandlingRegression'
225abc5 InstallGen/CPack fix handling absolute installed file regression
-rw-r--r--Source/cmInstallGenerator.cxx7
1 files changed, 5 insertions, 2 deletions
diff --git a/Source/cmInstallGenerator.cxx b/Source/cmInstallGenerator.cxx
index 9d5e416..d7505dc 100644
--- a/Source/cmInstallGenerator.cxx
+++ b/Source/cmInstallGenerator.cxx
@@ -67,8 +67,11 @@ void cmInstallGenerator
for(std::vector<std::string>::const_iterator fi = files.begin();
fi != files.end(); ++fi)
{
- if (fi!=files.begin()) os << ";";
- os << dest << cmSystemTools::ConvertToOutputPath("/");
+ if (fi!=files.begin())
+ {
+ os << ";";
+ }
+ os << dest << "/";
if (rename && *rename)
{
os << rename;