diff options
| author | Tor Arne Vestbø <torarnv@gmail.com> | 2014-09-30 16:39:12 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2014-10-01 21:53:32 +0200 |
| commit | d44781730ccd4d48af79f480813bf3f9a4000253 (patch) | |
| tree | 245b08446b501bbec5e83b3ca29b25f09a52d243 /configure | |
| parent | 3b577dfe798bf5065a2bba4d7095709454aa709c (diff) | |
configure: Disable pkg-config on OS X unless explicitly requested
We don't have an explicit XPLATFORM_OSX, but XPLATFORM_MAC applies
to both OS X and iOS (as now clarified), so we move the default
out of the XPLATFORM_IOS scope and to a XPLATFORM_MAC scope.
Change-Id: I6b9ba9c881c28def08b9ab863d0165fbd9dedc6d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -699,8 +699,8 @@ RPATH_FLAGS= W_FLAGS= QCONFIG_FLAGS= XPLATFORM= # This seems to be the QMAKESPEC, like "linux-g++" -XPLATFORM_MAC=no -XPLATFORM_IOS=no +XPLATFORM_MAC=no # Whether target platform is OS X or iOS +XPLATFORM_IOS=no # Whether target platform is iOS XPLATFORM_ANDROID=no XPLATFORM_MINGW=no # Whether target platform is MinGW (win32-g++*) XPLATFORM_QNX=no @@ -3120,9 +3120,12 @@ if [ "$CFG_FORCEDEBUGINFO" = "yes" ]; then QMAKE_CONFIG="$QMAKE_CONFIG force_debug_info" fi +if [ "$XPLATFORM_MAC" = "yes" ]; then + CFG_PKGCONFIG="no" +fi + if [ "$XPLATFORM_IOS" = "yes" ]; then CFG_RPATH="no" - CFG_PKGCONFIG="no" CFG_NOBUILD_PARTS="$CFG_NOBUILD_PARTS examples" CFG_SHARED="no" # iOS builds should be static to be able to submit to the App Store CFG_SKIP_MODULES="$CFG_SKIP_MODULES qtconnectivity qtdoc qtmacextras qtserialport qtwebkit qtwebkit-examples" |