From d5e56fd9135f61b05596cfdf095b301bc5cb3fef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Fri, 13 Feb 2015 15:19:32 +0100 Subject: Xcode: Make QMAKE_MAC_SDK_(PLATFORM_)PATH depend on active SDK MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The Xcode project generator doesn't support exclusive builds, and always runs as the default debug/release config, and with iPhoneOS as the target platform. This means we need to parameterize the QMAKE_MAC_SDK_* build settings to depend on the currently active SDK in Xcode, so that the paths, when used in eg. linker flags, are up to date. Change-Id: I9ca10f794e14ab440d98820657758b3fd8a7cdb0 Reviewed-by: Oswald Buddenhagen Reviewed-by: Richard Moe Gustavsen Reviewed-by: Tor Arne Vestbø --- mkspecs/macx-ios-clang/features/sdk.prf | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'mkspecs') diff --git a/mkspecs/macx-ios-clang/features/sdk.prf b/mkspecs/macx-ios-clang/features/sdk.prf index 003789b5be..32fcbb7289 100644 --- a/mkspecs/macx-ios-clang/features/sdk.prf +++ b/mkspecs/macx-ios-clang/features/sdk.prf @@ -13,3 +13,21 @@ load(sdk) lessThan(QMAKE_MAC_SDK_VERSION, "8.0"): \ error("Current $$QMAKE_MAC_SDK SDK version ($$QMAKE_MAC_SDK_VERSION) is too old. Please upgrade Xcode.") + +macx-xcode { + sdk_path_iphoneos.name = "QMAKE_MAC_SDK_PATH[sdk=iphoneos*]" + sdk_path_iphoneos.value = $$QMAKE_MAC_SDK_PATH + QMAKE_MAC_SDK_PATH ~= s,iPhoneOS,iPhoneSimulator, + sdk_path_iphonesimulator.name = "QMAKE_MAC_SDK_PATH[sdk=iphonesimulator*]" + sdk_path_iphonesimulator.value = $$QMAKE_MAC_SDK_PATH + QMAKE_MAC_XCODE_SETTINGS += sdk_path_iphoneos sdk_path_iphonesimulator + QMAKE_MAC_SDK_PATH = "$(QMAKE_MAC_SDK_PATH)" + + sdk_platform_path_iphoneos.name = "QMAKE_MAC_SDK_PLATFORM_PATH[sdk=iphoneos*]" + sdk_platform_path_iphoneos.value = $$QMAKE_MAC_SDK_PLATFORM_PATH + QMAKE_MAC_SDK_PLATFORM_PATH ~= s,iPhoneOS,iPhoneSimulator, + sdk_platform_path_iphonesimulator.name = "QMAKE_MAC_SDK_PLATFORM_PATH[sdk=iphonesimulator*]" + sdk_platform_path_iphonesimulator.value = $$QMAKE_MAC_SDK_PLATFORM_PATH + QMAKE_MAC_XCODE_SETTINGS += sdk_platform_path_iphoneos sdk_platform_path_iphonesimulator + QMAKE_MAC_SDK_PLATFORM_PATH = "$(QMAKE_MAC_SDK_PLATFORM_PATH)" +} -- cgit v1.2.3