diff options
| author | Brad King <brad.king@kitware.com> | 2014-09-22 13:30:52 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-09-22 13:32:21 (GMT) |
| commit | 92b2c6189ddbe1293989d469c214f6f306b2ed6e (patch) | |
| tree | 4566fce1b8b239c75f806f401090635a36fcff07 | |
| parent | 0ab2718448fbcdd1f85b76a7186b65a818a5cd1c (diff) | |
| download | CMake-92b2c6189ddbe1293989d469c214f6f306b2ed6e.zip CMake-92b2c6189ddbe1293989d469c214f6f306b2ed6e.tar.gz CMake-92b2c6189ddbe1293989d469c214f6f306b2ed6e.tar.bz2 | |
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.
| -rw-r--r-- | Source/cmTarget.cxx | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index acae0b3..f4714a9 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -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()) |