diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2016-07-28 13:01:43 +0200 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2016-08-05 11:42:22 +0200 |
| commit | 95b6d48b710a38b7969b72b6d2a89f3930fdbc0f (patch) | |
| tree | 6e9b3ebd71c0c9b12ba4f2cd28fadf17daa182ae /Makefile | |
| parent | 6ccdd7d4817ea550db0578fa63da5d0f9335297b (diff) | |
| download | qtlocation-mapboxgl-95b6d48b710a38b7969b72b6d2a89f3930fdbc0f.tar.gz | |
[build] use cmake script bundled with Mason
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -337,8 +337,9 @@ $(QT_BUILD): $(BUILD_DEPS) (cd $(QT_OUTPUT_PATH) && cmake -G Ninja ../../.. \ -DCMAKE_BUILD_TYPE=$(BUILDTYPE) \ -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \ - -DBUILD_PLATFORM=$(BUILD_PLATFORM) \ -DMBGL_PLATFORM=qt \ + -DMASON_PLATFORM=$(BUILD_PLATFORM) \ + -DMASON_PLATFORM_VERSION=$(BUILD_PLATFORM_VERSION) \ -DWITH_QT_DECODERS=${WITH_QT_DECODERS} \ -DWITH_QT_4=${WITH_QT_4} \ -DWITH_CXX11ABI=$(shell scripts/check-cxx11abi.sh) \ @@ -350,8 +351,9 @@ MACOS_QT_PROJ_PATH = $(QT_ROOT_PATH)/xcode/mbgl.xcodeproj $(MACOS_QT_PROJ_PATH): $(BUILD_DEPS) mkdir -p $(QT_ROOT_PATH)/xcode (cd $(QT_ROOT_PATH)/xcode && cmake -G Xcode ../../.. \ - -DBUILD_PLATFORM=$(BUILD_PLATFORM) \ -DMBGL_PLATFORM=qt \ + -DMASON_PLATFORM=$(BUILD_PLATFORM) \ + -DMASON_PLATFORM_VERSION=$(BUILD_PLATFORM_VERSION) \ -DWITH_QT_DECODERS=${WITH_QT_DECODERS} \ -DWITH_QT_4=${WITH_QT_4} \ -DWITH_CXX11ABI=$(shell scripts/check-cxx11abi.sh) \ |