summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorBruno de Oliveira Abinader <bruno@mapbox.com>2016-12-12 16:50:48 +0200
committerBruno de Oliveira Abinader <bruno@mapbox.com>2016-12-12 22:34:52 +0200
commitb65b2f1c299eb545ae0dab454c51f11c5833fdd8 (patch)
treedc5d610af16e4a4397bfc5dc7651073e1490fe03 /Makefile
parentc0e18ad80c56d6197cb0e5f1e29384ad54491dbb (diff)
downloadqtlocation-mapboxgl-b65b2f1c299eb545ae0dab454c51f11c5833fdd8.tar.gz
[qt] Skip ICU if WITH_QT_I18N is set
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index d8fdc7481c..d5b8fc2cdb 100644
--- a/Makefile
+++ b/Makefile
@@ -389,6 +389,7 @@ $(QT_BUILD): $(BUILD_DEPS)
-DMASON_PLATFORM=$(BUILD_PLATFORM) \
-DMASON_PLATFORM_VERSION=$(BUILD_PLATFORM_VERSION) \
-DWITH_QT_DECODERS=${WITH_QT_DECODERS} \
+ -DWITH_QT_I18N=${WITH_QT_I18N} \
-DWITH_QT_4=${WITH_QT_4} \
-DWITH_CXX11ABI=$(shell scripts/check-cxx11abi.sh) \
-DWITH_COVERAGE=${WITH_COVERAGE} \
@@ -404,6 +405,7 @@ $(MACOS_QT_PROJ_PATH): $(BUILD_DEPS)
-DMASON_PLATFORM=$(BUILD_PLATFORM) \
-DMASON_PLATFORM_VERSION=$(BUILD_PLATFORM_VERSION) \
-DWITH_QT_DECODERS=${WITH_QT_DECODERS} \
+ -DWITH_QT_I18N=${WITH_QT_I18N} \
-DWITH_QT_4=${WITH_QT_4} \
-DWITH_CXX11ABI=$(shell scripts/check-cxx11abi.sh) \
-DWITH_COVERAGE=${WITH_COVERAGE} \