diff options
| author | Brad King <brad.king@kitware.com> | 2006-02-18 21:47:28 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2006-02-18 21:47:28 (GMT) |
| commit | 377f4e79b1c3a42ec484d3f2270d8c8e1d24b27b (patch) | |
| tree | 7e7e35414884b7d911c497bf00f47c5a8555475c | |
| parent | cd3c98d0325dc6c4a8085cc4863114b6fbd08415 (diff) | |
| download | CMake-377f4e79b1c3a42ec484d3f2270d8c8e1d24b27b.zip CMake-377f4e79b1c3a42ec484d3f2270d8c8e1d24b27b.tar.gz CMake-377f4e79b1c3a42ec484d3f2270d8c8e1d24b27b.tar.bz2 | |
BUG: Remove trailing slashes from install destinations.
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 54d8e05..a72faf9 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -378,6 +378,10 @@ void cmLocalGenerator::GenerateInstallRules() { bool need_relink = l->second.NeedRelinkBeforeInstall(); destination = "${CMAKE_INSTALL_PREFIX}" + l->second.GetInstallPath(); + if(destination[destination.size()-1] == '/') + { + destination = destination.substr(0, destination.size()-1); + } cmSystemTools::ConvertToUnixSlashes(destination); const char* dest = destination.c_str(); int type = l->second.GetType(); @@ -409,6 +413,10 @@ void cmLocalGenerator::GenerateInstallRules() // Change the destination to the .dll destination. destination = "${CMAKE_INSTALL_PREFIX}" + l->second.GetRuntimeInstallPath(); + if(destination[destination.size()-1] == '/') + { + destination = destination.substr(0, destination.size()-1); + } dest = destination.c_str(); } else |