kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUG: Remove trailing slashes from install destinations.

Browse Source
This commit is contained in:
Brad King 2006-02-18 16:47:28 -05:00
parent cd3c98d032
commit 377f4e79b1
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/cmLocalGenerator.cxx
View File

@ -378,6 +378,10 @@ void cmLocalGenerator::GenerateInstallRules()
{ {
bool need_relink = l->second.NeedRelinkBeforeInstall(); bool need_relink = l->second.NeedRelinkBeforeInstall();
destination = "${CMAKE_INSTALL_PREFIX}" + l->second.GetInstallPath(); destination = "${CMAKE_INSTALL_PREFIX}" + l->second.GetInstallPath();
if(destination[destination.size()-1] == '/')
{
destination = destination.substr(0, destination.size()-1);
}
cmSystemTools::ConvertToUnixSlashes(destination); cmSystemTools::ConvertToUnixSlashes(destination);
const char* dest = destination.c_str(); const char* dest = destination.c_str();
int type = l->second.GetType(); int type = l->second.GetType();
@ -409,6 +413,10 @@ void cmLocalGenerator::GenerateInstallRules()
// Change the destination to the .dll destination. // Change the destination to the .dll destination.
destination = "${CMAKE_INSTALL_PREFIX}" + l->second.GetRuntimeInstallPath(); destination = "${CMAKE_INSTALL_PREFIX}" + l->second.GetRuntimeInstallPath();
if(destination[destination.size()-1] == '/')
{
destination = destination.substr(0, destination.size()-1);
}
dest = destination.c_str(); dest = destination.c_str();
} }
else else