mirror of
https://github.com/Kitware/CMake.git
synced 2025-12-31 10:50:16 -06:00
Remove extra slashes from LOCATION target property value
In commit v3.0.0-rc1~429^2~2 (Remove the Location member from cmTarget, 2012-10-07) a few extra slashes were added to the path construction logic, perhaps due to a partially implemented attempt at handling the case that GetDirectory returns an empty string. This leads to LOCATION paths with double slashes in some cases. Remove them now.
This commit is contained in:
@@ -2769,16 +2769,11 @@ const char* cmTarget::GetLocationForBuild() const
|
||||
|
||||
// Now handle the deprecated build-time configuration location.
|
||||
location = this->GetDirectory();
|
||||
if(!location.empty())
|
||||
{
|
||||
location += "/";
|
||||
}
|
||||
const char* cfgid = this->Makefile->GetDefinition("CMAKE_CFG_INTDIR");
|
||||
if(cfgid && strcmp(cfgid, ".") != 0)
|
||||
{
|
||||
location += "/";
|
||||
location += cfgid;
|
||||
location += "/";
|
||||
}
|
||||
|
||||
if(this->IsAppBundleOnApple())
|
||||
|
||||
Reference in New Issue
Block a user