diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2013-05-08 12:21:05 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-05-08 14:07:41 +0200 |
| commit | 1308aa25fbf45995eac075688165e42d9e1c90f5 (patch) | |
| tree | 305f432e77adc393f1bf8b2e42ccea96ddfd4606 /mkspecs/common | |
| parent | 032befa819cfb335876a08ca7aa5acab6d7a2f17 (diff) | |
Cache Xcode and SDK settings in .qmake.cache if it exists
The Xcode and SDK settings are expensive to resolve, as we're using
system() calls to resolve them. We now try to detect the presence of
a .qmake.cache file (and inform the user that creating one would be
a good idea), and use the file to cache the various settings after
resolving them.
The Xcode logic had to be moved form xcode.conf as part of the mkspec,
into default_pre/post.prf, so that we could cache() the resolved values.
Task-number: QTBUG-30586
Change-Id: Ib5368cfee6f7e4a4a33f6be70d0e20d96896fe56
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'mkspecs/common')
| -rw-r--r-- | mkspecs/common/ios/clang.conf | 7 | ||||
| -rw-r--r-- | mkspecs/common/mac.conf | 3 | ||||
| -rw-r--r-- | mkspecs/common/xcode.conf | 21 |
3 files changed, 0 insertions, 31 deletions
diff --git a/mkspecs/common/ios/clang.conf b/mkspecs/common/ios/clang.conf index 5da7e5a233..8da555e6fa 100644 --- a/mkspecs/common/ios/clang.conf +++ b/mkspecs/common/ios/clang.conf @@ -1,10 +1,6 @@ # # compiler settings for iOS clang compilers # -# Depends on: -# -# QMAKE_XCODE_VERSION - set in xcode.conf -# # iOS build flags QMAKE_IOS_CFLAGS += -fvisibility=hidden -fpascal-strings -fmessage-length=0 @@ -24,9 +20,6 @@ QMAKE_IOS_CFLAGS += -Wno-missing-field-initializers -Wno-missing-prototype QMAKE_IOS_CXXFLAGS += -Wno-non-virtual-dtor -Wno-overloaded-virtual -Wno-exit-time-destructors QMAKE_IOS_OBJ_CFLAGS += -Wno-deprecated-implementations -Wprotocol -Wno-selector -Wno-strict-selector-match -Wno-undeclared-selector -# Warn about unsupported (later than 4.5) Xcode versions -!lessThan(QMAKE_XCODE_VERSION, "4.7"): warning("The version of Xcode installed on this system is not recognised - custom compiler settings may be necessary") - # Set build flags QMAKE_CFLAGS += $$QMAKE_IOS_CFLAGS QMAKE_CXXFLAGS += $$QMAKE_IOS_CFLAGS $$QMAKE_IOS_CXXFLAGS diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf index f31db3bb4b..cf54f3f580 100644 --- a/mkspecs/common/mac.conf +++ b/mkspecs/common/mac.conf @@ -26,7 +26,4 @@ QMAKE_LIBS_THREAD = QMAKE_AR = ar cq QMAKE_RANLIB = ranlib -s -# We rely on Xcode to build -include(xcode.conf) - include(unix.conf) diff --git a/mkspecs/common/xcode.conf b/mkspecs/common/xcode.conf deleted file mode 100644 index b15266b678..0000000000 --- a/mkspecs/common/xcode.conf +++ /dev/null @@ -1,21 +0,0 @@ -# -# qmake configuration for Xcode -# - -# Get path of Xcode's Developer directory -QMAKE_XCODE_DEVELOPER_PATH = $$system("/usr/bin/xcode-select --print-path 2>/dev/null") -isEmpty(QMAKE_XCODE_DEVELOPER_PATH): \ - error("Xcode path is not set. Please use xcode-select to choose Xcode installation path.") - -# Make sure Xcode path is valid -!exists($$QMAKE_XCODE_DEVELOPER_PATH): \ - error("Xcode is not installed in $${QMAKE_XCODE_DEVELOPER_PATH}. Please use xcode-select to choose Xcode installation path.") - -# Make sure Xcode is set up properly -isEmpty($$list($$system("/usr/bin/xcrun -find xcrun 2>/dev/null"))): \ - error("Xcode not set up properly. You may need to confirm the license agreement by running /usr/bin/xcodebuild.") - -# Extract Xcode version using xcodebuild -xcode_version = $$system("/usr/bin/xcodebuild -version") -QMAKE_XCODE_VERSION = $$member(xcode_version, 1) -unset(xcode_version) |