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 | |
| 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.
| -rw-r--r-- | Source/cmTarget.cxx | 5 | ||||
| -rw-r--r-- | Tests/RunCMake/XcodeProject/XcodeBundles.cmake | 1 | ||||
| -rw-r--r-- | Tests/iOSNavApp/CMakeLists.txt | 1 |
3 files changed, 2 insertions, 5 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); } diff --git a/Tests/RunCMake/XcodeProject/XcodeBundles.cmake b/Tests/RunCMake/XcodeProject/XcodeBundles.cmake index d5cb51f..2cbccfa 100644 --- a/Tests/RunCMake/XcodeProject/XcodeBundles.cmake +++ b/Tests/RunCMake/XcodeProject/XcodeBundles.cmake @@ -6,7 +6,6 @@ enable_language(C) if(TEST_IOS) set(CMAKE_OSX_SYSROOT iphoneos) set(CMAKE_OSX_ARCHITECTURES "armv7") - set(CMAKE_XCODE_EFFECTIVE_PLATFORMS "-iphoneos;-iphonesimulator") set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO") set(CMAKE_XCODE_ATTRIBUTE_ENABLE_BITCODE "NO") endif(TEST_IOS) diff --git a/Tests/iOSNavApp/CMakeLists.txt b/Tests/iOSNavApp/CMakeLists.txt index 12c3ada..1fc33e0 100644 --- a/Tests/iOSNavApp/CMakeLists.txt +++ b/Tests/iOSNavApp/CMakeLists.txt @@ -3,7 +3,6 @@ project(NavApp3) set(CMAKE_OSX_SYSROOT iphoneos4.3) set(CMAKE_OSX_ARCHITECTURES "armv6;armv7;i386") -set(CMAKE_XCODE_EFFECTIVE_PLATFORMS "-iphoneos;-iphonesimulator") include_directories( ${CMAKE_CURRENT_SOURCE_DIR} |