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

Merge topic 'fix-LOCATION-slashes'

Browse Source 
92b2c618 Remove extra slashes from LOCATION target property value
This commit is contained in:
Brad King 2014-09-24 09:21:46 -04:00 committed by CMake Topic Stage
commit e6a7abd2b6
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/cmTarget.cxx
View File

@ -2769,16 +2769,11 @@ const char* cmTarget::GetLocationForBuild() const
// Now handle the deprecated build-time configuration location. // Now handle the deprecated build-time configuration location.
location = this->GetDirectory(); location = this->GetDirectory();
if(!location.empty())
{
location += "/";
}
const char* cfgid = this->Makefile->GetDefinition("CMAKE_CFG_INTDIR"); const char* cfgid = this->Makefile->GetDefinition("CMAKE_CFG_INTDIR");
if(cfgid && strcmp(cfgid, ".") != 0) if(cfgid && strcmp(cfgid, ".") != 0)
{ {
location += "/"; location += "/";
location += cfgid; location += cfgid;
location += "/";
} }
if(this->IsAppBundleOnApple()) if(this->IsAppBundleOnApple())