From 5254876b39f0f25e727db18e516f1de81679fb41 Mon Sep 17 00:00:00 2001 From: "Thiago Marcos P. Santos" Date: Mon, 16 Sep 2019 12:04:27 +0300 Subject: [build] Remove Qt builds from legacy buildsystem --- Makefile | 95 ---------------------------------------------------------------- 1 file changed, 95 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 916c01fed0..1c1199932e 100644 --- a/Makefile +++ b/Makefile @@ -453,101 +453,6 @@ check: compdb endif -#### Qt targets ##################################################### - -QT_QMAKE_FOUND := $(shell command -v qmake 2> /dev/null) -ifdef QT_QMAKE_FOUND - export QT_INSTALL_DOCS = $(shell qmake -query QT_INSTALL_DOCS) - QT_ROOT_PATH = build/qt-$(BUILD_PLATFORM)-$(BUILD_PLATFORM_VERSION) -endif - -export QT_OUTPUT_PATH = $(QT_ROOT_PATH)/$(BUILDTYPE) -QT_BUILD = $(QT_OUTPUT_PATH)/build.ninja - -$(QT_BUILD): $(BUILD_DEPS) - @scripts/check-qt.sh - mkdir -p $(QT_OUTPUT_PATH) - (cd $(QT_OUTPUT_PATH) && $(CMAKE) -G Ninja ../../.. \ - -DCMAKE_BUILD_TYPE=$(BUILDTYPE) \ - -DMBGL_PLATFORM=qt \ - -DMASON_PLATFORM=$(MASON_PLATFORM) \ - -DMASON_PLATFORM_VERSION=$(MASON_PLATFORM_VERSION) \ - -DWITH_QT_DECODERS=${WITH_QT_DECODERS} \ - -DWITH_QT_I18N=${WITH_QT_I18N} \ - -DWITH_COVERAGE=${WITH_COVERAGE}) - -ifeq ($(HOST_PLATFORM), macos) - -MACOS_QT_PROJ_PATH = $(QT_ROOT_PATH)/xcode/mbgl.xcodeproj -$(MACOS_QT_PROJ_PATH): $(BUILD_DEPS) - @scripts/check-qt.sh - mkdir -p $(QT_ROOT_PATH)/xcode - (cd $(QT_ROOT_PATH)/xcode && $(CMAKE) -G Xcode ../../.. \ - -DMBGL_PLATFORM=qt \ - -DMASON_PLATFORM=$(MASON_PLATFORM) \ - -DMASON_PLATFORM_VERSION=$(MASON_PLATFORM_VERSION) \ - -DWITH_QT_DECODERS=${WITH_QT_DECODERS} \ - -DWITH_QT_I18N=${WITH_QT_I18N} \ - -DWITH_COVERAGE=${WITH_COVERAGE}) - -.PHONY: qtproj -qtproj: $(MACOS_QT_PROJ_PATH) - open $(MACOS_QT_PROJ_PATH) - -endif - -ifdef QNX_HOST -export WITH_QT_DECODERS ?= ON -export QCC_COMPILER_TARGET ?= gcc_ntox86_64 -export QCC_NTOARCH ?= x86_64 - -export QNX_OUTPUT_PATH = build/qt-qnx-$(QCC_NTOARCH)/$(BUILDTYPE) -QNX_QT_BUILD = $(QNX_OUTPUT_PATH)/build.ninja -$(QNX_QT_BUILD): $(BUILD_DEPS) - @scripts/check-qt.sh - mkdir -p $(QNX_OUTPUT_PATH) - (cd $(QNX_OUTPUT_PATH) && $(CMAKE) -G Ninja ../../.. \ - -DCMAKE_BUILD_TYPE=$(BUILDTYPE) \ - -DQCC_COMPILER_TARGET=${QCC_COMPILER_TARGET} \ - -DQCC_NTOARCH=${QCC_NTOARCH} \ - -DCMAKE_TOOLCHAIN_FILE=platform/qt/qnx.cmake \ - -DMBGL_PLATFORM=qt \ - -DWITH_QT_DECODERS=${WITH_QT_DECODERS} \ - -DWITH_QT_I18N=${WITH_QT_I18N} \ - -DWITH_COVERAGE=${WITH_COVERAGE}) - -.PHONY: qnx-qt-lib -qnx-qt-lib: $(QNX_QT_BUILD) - $(NINJA) $(NINJA_ARGS) -j$(JOBS) -C $(QNX_OUTPUT_PATH) qmapboxgl - -endif - -.PHONY: qt-lib -qt-lib: $(QT_BUILD) - $(NINJA) $(NINJA_ARGS) -j$(JOBS) -C $(QT_OUTPUT_PATH) qmapboxgl - -.PHONY: qt-app -qt-app: $(QT_BUILD) - $(NINJA) $(NINJA_ARGS) -j$(JOBS) -C $(QT_OUTPUT_PATH) mbgl-qt - -.PHONY: run-qt-app -run-qt-app: qt-app - $(QT_OUTPUT_PATH)/mbgl-qt - -.PHONY: qt-test -qt-test: $(QT_BUILD) - $(NINJA) $(NINJA_ARGS) -j$(JOBS) -C $(QT_OUTPUT_PATH) mbgl-test - -run-qt-test-%: qt-test - $(QT_OUTPUT_PATH)/mbgl-test --gtest_catch_exceptions=0 --gtest_filter=$* - -.PHONY: run-qt-test -run-qt-test: run-qt-test-* - -.PHONY: qt-docs -qt-docs: - qdoc $(shell pwd)/platform/qt/config.qdocconf -outputdir $(shell pwd)/$(QT_OUTPUT_PATH)/docs - #### Node targets ############################################################## .PHONY: test-node -- cgit v1.2.1