diff options
| author | Gregor Jasny <gjasny@googlemail.com> | 2015-08-20 20:29:49 (GMT) |
|---|---|---|
| committer | Gregor Jasny <gjasny@googlemail.com> | 2015-08-25 19:53:51 (GMT) |
| commit | d2c2319d6479d4319ef298f6178b00e953a9b179 (patch) | |
| tree | 801b6d63d38e29b12898af28986911163ab84822 /Source/cmTarget.cxx | |
| parent | cdb9984bff78b8f76c3b8c3f622928e4f29920a1 (diff) | |
| download | CMake-d2c2319d6479d4319ef298f6178b00e953a9b179.zip CMake-d2c2319d6479d4319ef298f6178b00e953a9b179.tar.gz CMake-d2c2319d6479d4319ef298f6178b00e953a9b179.tar.bz2 | |
Replace CMAKE_XCODE_EFFECTIVE_PLATFORMS with call to PlatformIsAppleIos
Currently the CMAKE_XCODE_EFFECTIVE_PLATFORMS property acts only as
a kind of toggle switch to enable iOS project layout features.
But instead of relying on this undocumented property, better detect
the presence of an iOS SDK directly.
Diffstat (limited to 'Source/cmTarget.cxx')
| -rw-r--r-- | Source/cmTarget.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index 49b3239..da314a6 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -3566,10 +3566,9 @@ bool cmTarget::ComputeOutputDir(const std::string& config, // The generator may add the configuration's subdirectory. if(!conf.empty()) { - const char *platforms = this->Makefile->GetDefinition( - "CMAKE_XCODE_EFFECTIVE_PLATFORMS"); + bool iosPlatform = this->Makefile->PlatformIsAppleIos(); std::string suffix = - usesDefaultOutputDir && platforms ? "$(EFFECTIVE_PLATFORM_NAME)" : ""; + usesDefaultOutputDir && iosPlatform ? "$(EFFECTIVE_PLATFORM_NAME)" : ""; this->Makefile->GetGlobalGenerator()-> AppendDirectoryForConfig("/", conf, suffix, out); } |