diff options
| author | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2019-07-23 18:31:41 +0300 |
|---|---|---|
| committer | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2019-08-15 20:41:32 +0300 |
| commit | 0dc45734956b72808ebd694b435759b8269acbd4 (patch) | |
| tree | 565cb5602fb70d3140e6d0830a77100e2b88495f | |
| parent | ae42420fe7b201b4ad4b0dd46c9d29d932ae1e80 (diff) | |
| download | qtlocation-mapboxgl-0dc45734956b72808ebd694b435759b8269acbd4.tar.gz | |
[build] FIXME: Delete files not in use
- Add back Doxygen
30 files changed, 0 insertions, 2639 deletions
diff --git a/Makefile b/Makefile deleted file mode 100644 index 9002542eee..0000000000 --- a/Makefile +++ /dev/null @@ -1,894 +0,0 @@ -export BUILDTYPE ?= Debug -export IS_LOCAL_DEVELOPMENT ?= true -export WITH_CXX11ABI ?= $(shell scripts/check-cxx11abi.sh) -export TARGET_BRANCH ?= master - -CMAKE ?= cmake - - -ifeq ($(BUILDTYPE), Release) -else ifeq ($(BUILDTYPE), RelWithDebInfo) -else ifeq ($(BUILDTYPE), Sanitize) -else ifeq ($(BUILDTYPE), Debug) -else - $(error BUILDTYPE must be Debug, Sanitize, Release or RelWithDebInfo) -endif - -buildtype := $(shell echo "$(BUILDTYPE)" | tr "[A-Z]" "[a-z]") - -ifeq ($(shell uname -s), Darwin) - HOST_PLATFORM = macos - HOST_PLATFORM_VERSION = $(shell uname -m) - export NINJA = platform/macos/ninja - export JOBS ?= $(shell sysctl -n hw.ncpu) -else ifeq ($(shell uname -s), Linux) - HOST_PLATFORM = linux - HOST_PLATFORM_VERSION = $(shell uname -m) - export NINJA = platform/linux/ninja - export JOBS ?= $(shell grep --count processor /proc/cpuinfo) -else - $(error Cannot determine host platform) -endif - -ifeq ($(MASON_PLATFORM),) - BUILD_PLATFORM = $(HOST_PLATFORM) -else - BUILD_PLATFORM = $(MASON_PLATFORM) -endif - -ifeq ($(MASON_PLATFORM_VERSION),) - BUILD_PLATFORM_VERSION = $(HOST_PLATFORM_VERSION) -else - BUILD_PLATFORM_VERSION = $(MASON_PLATFORM_VERSION) -endif - -ifeq ($(MASON_PLATFORM),macos) - MASON_PLATFORM=osx -endif - -ifeq ($(V), 1) - export XCPRETTY - NINJA_ARGS ?= -v -else - export XCPRETTY ?= | tee '$(shell pwd)/build/xcodebuild-$(shell date +"%Y-%m-%d_%H%M%S").log' | xcpretty - NINJA_ARGS ?= -endif - -.PHONY: default -default: test - -BUILD_DEPS += Makefile -BUILD_DEPS += CMakeLists.txt - -BUILD_DOCS ?= true - -#### macOS targets ############################################################## - -ifeq ($(HOST_PLATFORM), macos) - -export PATH := $(shell pwd)/platform/macos:$(PATH) - -MACOS_OUTPUT_PATH = build/macos -MACOS_PROJ_PATH = $(MACOS_OUTPUT_PATH)/mbgl.xcodeproj -MACOS_WORK_PATH = platform/macos/macos.xcworkspace -MACOS_USER_DATA_PATH = $(MACOS_WORK_PATH)/xcuserdata/$(USER).xcuserdatad -MACOS_COMPDB_PATH = $(MACOS_OUTPUT_PATH)/compdb/$(BUILDTYPE) - -MACOS_XCODEBUILD = xcodebuild \ - -derivedDataPath $(MACOS_OUTPUT_PATH) \ - -configuration $(BUILDTYPE) \ - -workspace $(MACOS_WORK_PATH) \ - -jobs $(JOBS) - -ifneq ($(CI),) - MACOS_XCODEBUILD += -xcconfig platform/darwin/ci.xcconfig -endif - -$(MACOS_PROJ_PATH): $(BUILD_DEPS) $(MACOS_USER_DATA_PATH)/WorkspaceSettings.xcsettings - mkdir -p $(MACOS_OUTPUT_PATH) - (cd $(MACOS_OUTPUT_PATH) && $(CMAKE) -G Xcode ../.. \ - -DWITH_EGL=${WITH_EGL}) - -$(MACOS_USER_DATA_PATH)/WorkspaceSettings.xcsettings: platform/macos/WorkspaceSettings.xcsettings - mkdir -p "$(MACOS_USER_DATA_PATH)" - cp platform/macos/WorkspaceSettings.xcsettings "$@" - -.PHONY: macos -macos: $(MACOS_PROJ_PATH) - set -o pipefail && $(MACOS_XCODEBUILD) -scheme 'CI' build $(XCPRETTY) - -.PHONY: xproj -xproj: $(MACOS_PROJ_PATH) - xed $(MACOS_WORK_PATH) - -.PHONY: test -test: $(MACOS_PROJ_PATH) - set -o pipefail && $(MACOS_XCODEBUILD) -scheme 'mbgl-test' build $(XCPRETTY) - -.PHONY: benchmark -benchmark: $(MACOS_PROJ_PATH) - set -o pipefail && $(MACOS_XCODEBUILD) -scheme 'mbgl-benchmark' build $(XCPRETTY) - -.PHONY: run-test -run-test: run-test-* - -run-test-%: test - ulimit -c unlimited && ($(MACOS_OUTPUT_PATH)/$(BUILDTYPE)/mbgl-test --gtest_catch_exceptions=0 --gtest_filter=$* & pid=$$! && wait $$pid \ - || (lldb -c /cores/core.$$pid --batch --one-line 'thread backtrace all' --one-line 'quit' && exit 1)) - set -o pipefail && $(MACOS_XCODEBUILD) -scheme 'CI' test $(XCPRETTY) - -.PHONY: run-benchmark -run-benchmark: run-benchmark-. - -run-benchmark-%: benchmark - $(MACOS_OUTPUT_PATH)/$(BUILDTYPE)/mbgl-benchmark --benchmark_filter=$* ${BENCHMARK_ARGS} - -.PHONY: node-benchmark -node-benchmark: node - -.PHONY: run-node-benchmark -run-node-benchmark: node-benchmark - node platform/node/test/benchmark.js - -.PHONY: glfw-app -glfw-app: $(MACOS_PROJ_PATH) - set -o pipefail && $(MACOS_XCODEBUILD) -scheme 'mbgl-glfw' build $(XCPRETTY) - -.PHONY: run-glfw-app -run-glfw-app: glfw-app - "$(MACOS_OUTPUT_PATH)/$(BUILDTYPE)/mbgl-glfw" - -.PHONY: render -render: $(MACOS_PROJ_PATH) - set -o pipefail && $(MACOS_XCODEBUILD) -scheme 'mbgl-render' build $(XCPRETTY) - -.PHONY: offline -offline: $(MACOS_PROJ_PATH) - set -o pipefail && $(MACOS_XCODEBUILD) -scheme 'mbgl-offline' build $(XCPRETTY) - -.PHONY: node -node: $(MACOS_PROJ_PATH) - set -o pipefail && $(MACOS_XCODEBUILD) -scheme 'mbgl-node (Active ABI)' build $(XCPRETTY) - -.PHONY: node-all -node-all: $(MACOS_PROJ_PATH) - set -o pipefail && $(MACOS_XCODEBUILD) -scheme 'mbgl-node (All ABIs)' build $(XCPRETTY) - -.PHONY: macos-test -macos-test: $(MACOS_PROJ_PATH) - set -o pipefail && $(MACOS_XCODEBUILD) -scheme 'CI' test $(XCPRETTY) - -.PHONY: macos-lint -macos-lint: - find platform/macos -type f -name '*.plist' | xargs plutil -lint - -.PHONY: xpackage -xpackage: $(MACOS_PROJ_PATH) - SYMBOLS=$(SYMBOLS) ./platform/macos/scripts/package.sh - -.PHONY: xdeploy -xdeploy: - caffeinate -i ./platform/macos/scripts/deploy-packages.sh - -.PHONY: xdocument -xdocument: - OUTPUT=$(OUTPUT) ./platform/macos/scripts/document.sh - -.PHONY: genstrings -genstrings: - genstrings -u -o platform/macos/sdk/Base.lproj platform/darwin/src/*.{m,mm} - genstrings -u -o platform/macos/sdk/Base.lproj platform/macos/src/*.{m,mm} - genstrings -u -o platform/ios/resources/Base.lproj platform/ios/src/*.{m,mm} - -find platform/ios/resources platform/macos/sdk -path '*/Base.lproj/*.strings' -exec \ - textutil -convert txt -extension strings -inputencoding UTF-16 -encoding UTF-8 {} \; - mv platform/macos/sdk/Base.lproj/Foundation.strings platform/darwin/resources/Base.lproj/ - -$(MACOS_COMPDB_PATH)/Makefile: - mkdir -p $(MACOS_COMPDB_PATH) - (cd $(MACOS_COMPDB_PATH) && $(CMAKE) ../../../.. \ - -DCMAKE_BUILD_TYPE=$(BUILDTYPE) \ - -DWITH_EGL=${WITH_EGL}) - -.PHONY: -compdb: $(BUILD_DEPS) $(TEST_DEPS) $(MACOS_COMPDB_PATH)/Makefile - @$(MAKE) -C $(MACOS_COMPDB_PATH) cmake_check_build_system - -.PHONY: tidy -tidy: compdb - scripts/clang-tools.sh $(MACOS_COMPDB_PATH) $(TARGET_BRANCH) - -.PHONY: check -check: compdb - scripts/clang-tools.sh $(MACOS_COMPDB_PATH) $(TARGET_BRANCH) --diff -endif - -#### iOS targets ############################################################## - -ifeq ($(HOST_PLATFORM), macos) - -IOS_OUTPUT_PATH = build/ios -IOS_PROJ_PATH = $(IOS_OUTPUT_PATH)/mbgl.xcodeproj -IOS_WORK_PATH = platform/ios/ios.xcworkspace -IOS_USER_DATA_PATH = $(IOS_WORK_PATH)/xcuserdata/$(USER).xcuserdatad - -IOS_XCODEBUILD_SIM = xcodebuild \ - ARCHS=x86_64 ONLY_ACTIVE_ARCH=YES \ - -derivedDataPath $(IOS_OUTPUT_PATH) \ - -configuration $(BUILDTYPE) -sdk iphonesimulator \ - -workspace $(IOS_WORK_PATH) \ - -jobs $(JOBS) - -ifneq ($(MORE_SIMULATORS),) - IOS_LATEST = true - IOS_11 = true - IOS_10 = true - IOS_9 = true -endif - -ifdef IOS_LATEST - IOS_XCODEBUILD_SIM += \ - -destination 'platform=iOS Simulator,OS=latest,name=iPhone 8' \ - -destination 'platform=iOS Simulator,OS=latest,name=iPhone Xs Max' \ - -destination 'platform=iOS Simulator,OS=latest,name=iPhone Xr' \ - -destination 'platform=iOS Simulator,OS=latest,name=iPad Pro (11-inch)' -endif - -ifdef IOS_11 - IOS_XCODEBUILD_SIM += \ - -destination 'platform=iOS Simulator,OS=11.4,name=iPhone 7' \ - -destination 'platform=iOS Simulator,OS=11.4,name=iPhone X' \ - -destination 'platform=iOS Simulator,OS=11.4,name=iPad (5th generation)' -endif - -ifdef IOS_10 - IOS_XCODEBUILD_SIM += \ - -destination 'platform=iOS Simulator,OS=10.3.1,name=iPhone SE' \ - -destination 'platform=iOS Simulator,OS=10.3.1,name=iPhone 7 Plus' \ - -destination 'platform=iOS Simulator,OS=10.3.1,name=iPad Pro (9.7-inch)' -endif - -ifdef IOS_9 - IOS_XCODEBUILD_SIM += \ - -destination 'platform=iOS Simulator,OS=9.3,name=iPhone 6s Plus' \ - -destination 'platform=iOS Simulator,OS=9.3,name=iPhone 6s' \ - -destination 'platform=iOS Simulator,OS=9.3,name=iPad Air 2' -endif - -# If IOS_XCODEBUILD_SIM does not contain a simulator destination, add the default. -ifeq (, $(findstring destination, $(IOS_XCODEBUILD_SIM))) - IOS_XCODEBUILD_SIM += \ - -destination 'platform=iOS Simulator,OS=latest,name=iPhone 8' -else - IOS_XCODEBUILD_SIM += -parallel-testing-enabled YES -endif - -ifneq ($(ONLY_TESTING),) - IOS_XCODEBUILD_SIM += -only-testing:$(ONLY_TESTING) -endif - -ifneq ($(SKIP_TESTING),) - IOS_XCODEBUILD_SIM += -skip-testing:$(SKIP_TESTING) -endif - -ifneq ($(CI),) - IOS_XCODEBUILD_SIM += -xcconfig platform/darwin/ci.xcconfig -endif - -$(IOS_PROJ_PATH): $(IOS_USER_DATA_PATH)/WorkspaceSettings.xcsettings $(BUILD_DEPS) - mkdir -p $(IOS_OUTPUT_PATH) - (cd $(IOS_OUTPUT_PATH) && $(CMAKE) -G Xcode ../.. \ - -DCMAKE_TOOLCHAIN_FILE=../../platform/ios/toolchain.cmake \ - -DMBGL_PLATFORM=ios \ - -DMASON_PLATFORM=ios) - -$(IOS_USER_DATA_PATH)/WorkspaceSettings.xcsettings: platform/ios/WorkspaceSettings.xcsettings - mkdir -p "$(IOS_USER_DATA_PATH)" - cp platform/ios/WorkspaceSettings.xcsettings "$@" - -.PHONY: ios -ios: $(IOS_PROJ_PATH) - set -o pipefail && $(IOS_XCODEBUILD_SIM) -scheme 'CI' build $(XCPRETTY) - -.PHONY: iproj -iproj: $(IOS_PROJ_PATH) - xed $(IOS_WORK_PATH) - -.PHONY: ios-lint -ios-lint: ios-pod-lint - find platform/ios/framework -type f -name '*.plist' | xargs plutil -lint - find platform/ios/app -type f -name '*.plist' | xargs plutil -lint - -.PHONY: ios-pod-lint -ios-pod-lint: - ./platform/ios/scripts/lint-podspecs.js - -.PHONY: ios-test -ios-test: $(IOS_PROJ_PATH) - set -o pipefail && $(IOS_XCODEBUILD_SIM) -scheme 'CI' test $(XCPRETTY) - -.PHONY: ios-integration-test -ios-integration-test: $(IOS_PROJ_PATH) - set -o pipefail && $(IOS_XCODEBUILD_SIM) -scheme 'Integration Test Harness' test $(XCPRETTY) - -.PHONY: ios-sanitize -ios-sanitize: $(IOS_PROJ_PATH) - set -o pipefail && $(IOS_XCODEBUILD_SIM) -scheme 'CI' -enableThreadSanitizer YES -enableUndefinedBehaviorSanitizer YES test $(XCPRETTY) - -.PHONY: ios-sanitize-address -ios-sanitize-address: $(IOS_PROJ_PATH) - set -o pipefail && $(IOS_XCODEBUILD_SIM) -scheme 'CI' -enableAddressSanitizer YES test $(XCPRETTY) - -.PHONY: ios-static-analyzer -ios-static-analyzer: $(IOS_PROJ_PATH) - set -o pipefail && $(IOS_XCODEBUILD_SIM) analyze -scheme 'CI' test $(XCPRETTY) - -.PHONY: ios-install-simulators -ios-install-simulators: - xcversion simulators --install="iOS 11.4" || true - xcversion simulators --install="iOS 10.3.1" || true - xcversion simulators --install="iOS 9.3" || true - -.PHONY: ios-check-events-symbols -ios-check-events-symbols: - ./platform/ios/scripts/check-events-symbols.sh - -.PHONY: ipackage -ipackage: ipackage* -ipackage%: - @echo make ipackage is deprecated — use make iframework. - -.PHONY: iframework -iframework: $(IOS_PROJ_PATH) - FORMAT=$(FORMAT) BUILD_DEVICE=$(BUILD_DEVICE) SYMBOLS=$(SYMBOLS) BUILD_DOCS=$(BUILD_DOCS) \ - ./platform/ios/scripts/package.sh - -.PHONY: ideploy -ideploy: - caffeinate -i ./platform/ios/scripts/deploy-packages.sh - -.PHONY: idocument -idocument: - OUTPUT=$(OUTPUT) ./platform/ios/scripts/document.sh - -.PHONY: darwin-style-code -darwin-style-code: - node platform/darwin/scripts/generate-style-code.js - node platform/darwin/scripts/update-examples.js -style-code: darwin-style-code - -.PHONY: darwin-update-examples -darwin-update-examples: - node platform/darwin/scripts/update-examples.js - -.PHONY: darwin-check-public-symbols -darwin-check-public-symbols: - node platform/darwin/scripts/check-public-symbols.js macOS iOS - -endif - -#### Linux targets ##################################################### - -ifeq ($(HOST_PLATFORM), linux) - -export PATH := $(shell pwd)/platform/linux:$(PATH) -export LINUX_OUTPUT_PATH = build/linux-$(shell uname -m)/$(BUILDTYPE) -LINUX_BUILD = $(LINUX_OUTPUT_PATH)/build.ninja - -$(LINUX_BUILD): $(BUILD_DEPS) - mkdir -p $(LINUX_OUTPUT_PATH) - (cd $(LINUX_OUTPUT_PATH) && $(CMAKE) -G Ninja ../../.. \ - -DCMAKE_BUILD_TYPE=$(BUILDTYPE) \ - -DWITH_CXX11ABI=${WITH_CXX11ABI} \ - -DWITH_COVERAGE=${WITH_COVERAGE} \ - -DWITH_OSMESA=${WITH_OSMESA} \ - -DWITH_EGL=${WITH_EGL}) - -.PHONY: linux -linux: glfw-app render offline - -.PHONY: linux-core -linux-core: $(LINUX_BUILD) - $(NINJA) $(NINJA_ARGS) -j$(JOBS) -C $(LINUX_OUTPUT_PATH) mbgl-core mbgl-loop-uv mbgl-filesource - -.PHONY: test -test: $(LINUX_BUILD) - $(NINJA) $(NINJA_ARGS) -j$(JOBS) -C $(LINUX_OUTPUT_PATH) mbgl-test - -.PHONY: benchmark -benchmark: $(LINUX_BUILD) - $(NINJA) $(NINJA_ARGS) -j$(JOBS) -C $(LINUX_OUTPUT_PATH) mbgl-benchmark - -GDB ?= gdb \ - -batch -return-child-result \ - -ex 'set print thread-events off' \ - -ex 'set disable-randomization off' \ - -ex 'run' \ - -ex 'thread apply all bt' --args - -.PHONY: run-test -run-test: run-test-* - -run-test-%: test - $(GDB) $(LINUX_OUTPUT_PATH)/mbgl-test --gtest_catch_exceptions=0 --gtest_filter=$* - -.PHONY: run-benchmark -run-benchmark: run-benchmark-. - -run-benchmark-%: benchmark - $(LINUX_OUTPUT_PATH)/mbgl-benchmark --benchmark_filter=$* - -.PHONY: render -render: $(LINUX_BUILD) - $(NINJA) $(NINJA_ARGS) -j$(JOBS) -C $(LINUX_OUTPUT_PATH) mbgl-render - -.PHONY: offline -offline: $(LINUX_BUILD) - $(NINJA) $(NINJA_ARGS) -j$(JOBS) -C $(LINUX_OUTPUT_PATH) mbgl-offline - -.PHONY: glfw-app -glfw-app: $(LINUX_BUILD) - $(NINJA) $(NINJA_ARGS) -j$(JOBS) -C $(LINUX_OUTPUT_PATH) mbgl-glfw - -.PHONY: run-glfw-app -run-glfw-app: glfw-app - cd $(LINUX_OUTPUT_PATH) && ./mbgl-glfw - -.PHONY: node -node: $(LINUX_BUILD) - $(NINJA) $(NINJA_ARGS) -j$(JOBS) -C $(LINUX_OUTPUT_PATH) mbgl-node.active - -.PHONY: node-all -node-all: $(LINUX_BUILD) - $(NINJA) $(NINJA_ARGS) -j$(JOBS) -C $(LINUX_OUTPUT_PATH) mbgl-node.all - -.PHONY: compdb -compdb: $(LINUX_BUILD) - # Ninja generator already outputs the file at the right location - -.PHONY: tidy -tidy: compdb - scripts/clang-tools.sh $(LINUX_OUTPUT_PATH) $(TARGET_BRANCH) - -.PHONY: check -check: compdb - scripts/clang-tools.sh $(LINUX_OUTPUT_PATH) $(TARGET_BRANCH) --diff - -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_CXX11ABI=${WITH_CXX11ABI} \ - -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_CXX11ABI=${WITH_CXX11ABI} \ - -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_CXX11ABI=${WITH_CXX11ABI} \ - -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 -test-node: node - npm test - npm run test-query - npm run test-memory - npm run test-expressions - -#### Android targets ########################################################### - -MBGL_ANDROID_ABIS = arm-v7;armeabi-v7a -MBGL_ANDROID_ABIS += arm-v8;arm64-v8a -MBGL_ANDROID_ABIS += x86;x86 -MBGL_ANDROID_ABIS += x86-64;x86_64 - -MBGL_ANDROID_LOCAL_WORK_DIR = /data/local/tmp/core-tests -MBGL_ANDROID_LOCAL_BENCHMARK_DIR = /data/local/tmp/benchmark -MBGL_ANDROID_LIBDIR = lib$(if $(filter arm-v8 x86-64,$1),64) -MBGL_ANDROID_DALVIKVM = dalvikvm$(if $(filter arm-v8 x86-64,$1),64,32) -MBGL_ANDROID_APK_SUFFIX = $(if $(filter Release,$(BUILDTYPE)),release,debug) -MBGL_ANDROID_CORE_TEST_DIR = platform/android/MapboxGLAndroidSDK/.externalNativeBuild/cmake/$(buildtype)/$2/core-tests -MBGL_ANDROID_BENCHMARK_DIR = platform/android/MapboxGLAndroidSDK/.externalNativeBuild/cmake/$(buildtype)/$2/benchmark -MBGL_ANDROID_STL ?= c++_static -MBGL_ANDROID_GRADLE = ./gradlew --parallel --max-workers=$(JOBS) -Pmapbox.buildtype=$(buildtype) -Pmapbox.stl=$(MBGL_ANDROID_STL) - -# Lists all devices, and extracts the identifiers, then obtains the ABI for every one. -# Some devices return \r\n, so we'll have to remove the carriage return before concatenating. -MBGL_ANDROID_ACTIVE_ARCHS = $(shell adb devices | sed '1d;/^\*/d;s/[[:space:]].*//' | xargs -n 1 -I DEV `type -P adb` -s DEV shell getprop ro.product.cpu.abi | tr -d '\r') - -# Generate code based on the style specification -.PHONY: android-style-code -android-style-code: - node platform/android/scripts/generate-style-code.js -style-code: android-style-code - -# Configuration file for running CMake from Gradle within Android Studio. -platform/android/gradle/configuration.gradle: - @printf "ext {\n node = '`command -v node || command -v nodejs`'\n npm = '`command -v npm`'\n ccache = '`command -v ccache`'\n}" > $@ - -define ANDROID_RULES -# $1 = arm-v7 (short arch) -# $2 = armeabi-v7a (internal arch) - -.PHONY: android-test-lib-$1 -android-test-lib-$1: platform/android/gradle/configuration.gradle - cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=$2 -Pmapbox.with_test=true :MapboxGLAndroidSDKTestApp:assemble$(BUILDTYPE) - -.PHONY: android-benchmark-$1 -android-benchmark-$1: platform/android/gradle/configuration.gradle - cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=$2 -Pmapbox.with_benchmark=true :MapboxGLAndroidSDKTestApp:assemble$(BUILDTYPE) - -# Build SDK for for specified abi -.PHONY: android-lib-$1 -android-lib-$1: platform/android/gradle/configuration.gradle - cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=$2 :MapboxGLAndroidSDK:assemble$(BUILDTYPE) - -# Build test app and SDK for for specified abi -.PHONY: android-$1 -android-$1: platform/android/gradle/configuration.gradle - cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=$2 :MapboxGLAndroidSDKTestApp:assemble$(BUILDTYPE) - -# Build the core test for specified abi -.PHONY: android-core-test-$1 -android-core-test-$1: android-test-lib-$1 - # Compile main sources and extract the classes (using the test app to get all transitive dependencies in one place) - mkdir -p $(MBGL_ANDROID_CORE_TEST_DIR) - unzip -o platform/android/MapboxGLAndroidSDKTestApp/build/outputs/apk/$(buildtype)/MapboxGLAndroidSDKTestApp-$(MBGL_ANDROID_APK_SUFFIX).apk classes.dex -d $(MBGL_ANDROID_CORE_TEST_DIR) - -run-android-core-test-$1-%: android-core-test-$1 - # Ensure clean state on the device - adb shell "rm -Rf $(MBGL_ANDROID_LOCAL_WORK_DIR) && mkdir -p $(MBGL_ANDROID_LOCAL_WORK_DIR)/test && mkdir -p $(MBGL_ANDROID_LOCAL_WORK_DIR)/mapbox-gl-js/src/style-spec/reference" - - # Push all needed files to the device - adb push $(MBGL_ANDROID_CORE_TEST_DIR)/classes.dex $(MBGL_ANDROID_LOCAL_WORK_DIR) > /dev/null 2>&1 - adb push platform/android/MapboxGLAndroidSDK/build/intermediates/intermediate-jars/$(buildtype)/jni/$2/libmapbox-gl.so $(MBGL_ANDROID_LOCAL_WORK_DIR) > /dev/null 2>&1 - adb push test/fixtures $(MBGL_ANDROID_LOCAL_WORK_DIR)/test > /dev/null 2>&1 - adb push mapbox-gl-js/src/style-spec/reference/v8.json $(MBGL_ANDROID_LOCAL_WORK_DIR)/mapbox-gl-js/src/style-spec/reference > /dev/null 2>&1 - adb push platform/android/MapboxGLAndroidSDK/build/intermediates/cmake/$(buildtype)/obj/$2/mbgl-test $(MBGL_ANDROID_LOCAL_WORK_DIR) > /dev/null 2>&1 - -# Create gtest filter for skipped tests. - $(eval SKIPPED_TESTS := -$(shell sed -n '/#\|^$$/!p' platform/android/tests/skipped.txt | sed ':a;$!N;s/\n/:/g;ta')) - - # Kick off the tests - adb shell "export LD_LIBRARY_PATH=$(MBGL_ANDROID_LOCAL_WORK_DIR) && cd $(MBGL_ANDROID_LOCAL_WORK_DIR) && chmod +x mbgl-test && ./mbgl-test --class_path=$(MBGL_ANDROID_LOCAL_WORK_DIR)/classes.dex --gtest_filter=$$*:$(SKIPPED_TESTS)" - - # Gather the results and unpack them - adb shell "cd $(MBGL_ANDROID_LOCAL_WORK_DIR) && tar -cvzf results.tgz test/fixtures/* > /dev/null 2>&1" - adb pull $(MBGL_ANDROID_LOCAL_WORK_DIR)/results.tgz $(MBGL_ANDROID_CORE_TEST_DIR)/ > /dev/null 2>&1 - rm -rf $(MBGL_ANDROID_CORE_TEST_DIR)/results && mkdir -p $(MBGL_ANDROID_CORE_TEST_DIR)/results - tar -xzf $(MBGL_ANDROID_CORE_TEST_DIR)/results.tgz --strip-components=2 -C $(MBGL_ANDROID_CORE_TEST_DIR)/results - -# Run the core test for specified abi -.PHONY: run-android-core-test-$1 -run-android-core-test-$1: run-android-core-test-$1-* - -# Run benchmarks for specified abi -.PHONY: run-android-benchmark-$1 -run-android-benchmark-$1: run-android-benchmark-$1-* - -run-android-benchmark-$1-%: android-benchmark-$1 - mkdir -p $(MBGL_ANDROID_BENCHMARK_DIR) - unzip -o platform/android/MapboxGLAndroidSDKTestApp/build/outputs/apk/$(buildtype)/MapboxGLAndroidSDKTestApp-$(MBGL_ANDROID_APK_SUFFIX).apk classes.dex -d $(MBGL_ANDROID_BENCHMARK_DIR) - - # Delete old test folder and create new one - adb shell "rm -Rf $(MBGL_ANDROID_LOCAL_BENCHMARK_DIR) && mkdir -p $(MBGL_ANDROID_LOCAL_BENCHMARK_DIR)/benchmark && mkdir -p $(MBGL_ANDROID_LOCAL_BENCHMARK_DIR)/test" - - # Push compiled java sources, test data and executable to device - adb push $(MBGL_ANDROID_BENCHMARK_DIR)/classes.dex $(MBGL_ANDROID_LOCAL_BENCHMARK_DIR) > /dev/null 2>&1 - adb push platform/android/MapboxGLAndroidSDK/build/intermediates/intermediate-jars/$(buildtype)/jni/$2/libmapbox-gl.so $(MBGL_ANDROID_LOCAL_BENCHMARK_DIR) > /dev/null 2>&1 - adb push benchmark/fixtures $(MBGL_ANDROID_LOCAL_BENCHMARK_DIR)/benchmark > /dev/null 2>&1 - adb push test/fixtures $(MBGL_ANDROID_LOCAL_BENCHMARK_DIR)/test > /dev/null 2>&1 - adb push platform/android/MapboxGLAndroidSDK/build/intermediates/cmake/$(buildtype)/obj/$2/mbgl-benchmark $(MBGL_ANDROID_LOCAL_BENCHMARK_DIR) > /dev/null 2>&1 - - # Run benchmark. Number of benchmark iterations can be set by run-android-benchmark-N parameter. - adb shell "export LD_LIBRARY_PATH=$(MBGL_ANDROID_LOCAL_BENCHMARK_DIR) && cd $(MBGL_ANDROID_LOCAL_BENCHMARK_DIR) && chmod +x mbgl-benchmark && ./mbgl-benchmark --class_path=$(MBGL_ANDROID_LOCAL_BENCHMARK_DIR)/classes.dex --benchmark_repetitions=$$* --benchmark_format=json --benchmark_out=results.json" - - # Pull results.json from the device - rm -rf $(MBGL_ANDROID_BENCHMARK_DIR)/results && mkdir -p $(MBGL_ANDROID_BENCHMARK_DIR)/results - adb pull $(MBGL_ANDROID_LOCAL_BENCHMARK_DIR)/results.json $(MBGL_ANDROID_BENCHMARK_DIR)/results > /dev/null 2>&1 - -# Run the test app on connected android device with specified abi -.PHONY: run-android-$1 -run-android-$1: platform/android/gradle/configuration.gradle - -adb uninstall com.mapbox.mapboxsdk.testapp 2> /dev/null - cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=$2 :MapboxGLAndroidSDKTestApp:install$(BUILDTYPE) && adb shell am start -n com.mapbox.mapboxsdk.testapp/.activity.FeatureOverviewActivity - -# Build test app instrumentation tests apk and test app apk for specified abi -.PHONY: android-ui-test-$1 -android-ui-test-$1: platform/android/gradle/configuration.gradle - cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=$2 :MapboxGLAndroidSDKTestApp:assembleDebug :MapboxGLAndroidSDKTestApp:assembleAndroidTest - -# Run test app instrumentation tests on a connected android device or emulator with specified abi -.PHONY: run-android-ui-test-$1 -run-android-ui-test-$1: platform/android/gradle/configuration.gradle - -adb uninstall com.mapbox.mapboxsdk.testapp 2> /dev/null - cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=$2 :MapboxGLAndroidSDKTestApp:connectedAndroidTest - -# Run Java Instrumentation tests on a connected android device or emulator with specified abi and test filter -run-android-ui-test-$1-%: platform/android/gradle/configuration.gradle - -adb uninstall com.mapbox.mapboxsdk.testapp 2> /dev/null - cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=$2 :MapboxGLAndroidSDKTestApp:connectedAndroidTest -Pandroid.testInstrumentationRunnerArguments.class="$$*" - -# Symbolicate native stack trace with the specified abi -.PHONY: android-ndk-stack-$1 -android-ndk-stack-$1: platform/android/gradle/configuration.gradle - adb logcat | ndk-stack -sym platform/android/MapboxGLAndroidSDK/build/intermediates/cmake/debug/obj/$2/ - -# Run render tests with pixelmatch -.PHONY: run-android-render-test-$1 -run-android-render-test-$1: $(BUILD_DEPS) platform/android/gradle/configuration.gradle - -adb uninstall com.mapbox.mapboxsdk.testapp 2> /dev/null - # delete old test results - rm -rf platform/android/build/render-test/mapbox/ - # copy test definitions & ignore file to test app assets folder, clear old ones first - rm -rf platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/integration - cp -r mapbox-gl-js/test/integration platform/android/MapboxGLAndroidSDKTestApp/src/main/assets - cp platform/node/test/ignores.json platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/integration/ignores.json - # run RenderTest.java to generate static map images - cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=$2 :MapboxGLAndroidSDKTestApp:connectedAndroidTest -Pandroid.testInstrumentationRunnerArguments.class="com.mapbox.mapboxsdk.testapp.render.RenderTest" - # pull generated images from the device - adb pull "`adb shell 'printenv EXTERNAL_STORAGE' | tr -d '\r'`/mapbox/render" platform/android/build/render-test - # copy expected result and run pixelmatch - python platform/android/scripts/run-render-test.py - # remove test definitions from assets - rm -rf platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/integration - -endef - -# Explodes the arguments into individual variables -define ANDROID_RULES_INVOKER -$(call ANDROID_RULES,$(word 1,$1),$(word 2,$1)) -endef - -$(foreach abi,$(MBGL_ANDROID_ABIS),$(eval $(call ANDROID_RULES_INVOKER,$(subst ;, ,$(abi))))) - -# Build the Android SDK and test app with abi set to arm-v7 -.PHONY: android -android: android-arm-v7 - -# Build the Android SDK with abi set to arm-v7 -.PHONY: android-lib -android-lib: android-lib-arm-v7 - -# Run the test app on connected android device with abi set to arm-v7 -.PHONY: run-android -run-android: run-android-arm-v7 - -# Run Java Instrumentation tests on a connected android device or emulator with abi set to arm-v7 -.PHONY: run-android-ui-test -run-android-ui-test: run-android-ui-test-arm-v7 -run-android-ui-test-%: run-android-ui-test-arm-v7-% - -# Run Java Unit tests on the JVM of the development machine executing this -.PHONY: run-android-unit-test -run-android-unit-test: platform/android/gradle/configuration.gradle - cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=none :MapboxGLAndroidSDK:testDebugUnitTest --info -run-android-unit-test-%: platform/android/gradle/configuration.gradle - cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=none :MapboxGLAndroidSDK:testDebugUnitTest --info --tests "$*" - -# Run unit test and build a coverage report from .exec file generated by unit tests and .ec file generated by instrumentation tests -.PHONY: android-create-jacoco-report -android-create-jacoco-report: platform/android/gradle/configuration.gradle - cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=none :MapboxGLAndroidSDK:jacocoTestReport - -# Parse merged jacoco report and send it to S3 -.PHONY: android-parse-and-send-jacoco-report -android-parse-and-send-jacoco-report: - python platform/android/scripts/parse-jacoco-report.py - -# Builds a release package of the Android SDK -.PHONY: apackage -apackage: platform/android/gradle/configuration.gradle - make android-lib-arm-v7 && make android-lib-arm-v8 && make android-lib-x86 && make android-lib-x86-64 - cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=all assemble$(BUILDTYPE) - -# Build test app instrumentation tests apk and test app apk for all abi's -.PHONY: android-ui-test -android-ui-test: platform/android/gradle/configuration.gradle - cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=all :MapboxGLAndroidSDKTestApp:assembleDebug :MapboxGLAndroidSDKTestApp:assembleAndroidTest - -#Run instrumentations tests on MicroSoft App Center -.PHONY: run-android-test-app-center -run-android-test-app-center: - cd platform/android && appcenter test run espresso --app "mapboxcn-outlook.com/MapsSdk" --devices "mapboxcn-outlook.com/china" --app-path MapboxGLAndroidSDKTestApp/build/outputs/apk/debug/MapboxGLAndroidSDKTestApp-debug.apk --test-series "master" --locale "en_US" --build-dir MapboxGLAndroidSDKTestApp/build/outputs/apk/androidTest/debug - -# Uploads the compiled Android SDK to Bintray -.PHONY: run-android-upload-to-bintray -run-android-upload-to-bintray: platform/android/gradle/configuration.gradle - cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=all :MapboxGLAndroidSDK:bintrayUpload - -# Uploads the compiled Android SDK SNAPSHOT to oss.jfrog.org -.PHONY: run-android-upload-to-artifactory -run-android-upload-to-artifactory: platform/android/gradle/configuration.gradle - cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=all :MapboxGLAndroidSDK:artifactoryPublish - -# Dump system graphics information for the test app -.PHONY: android-gfxinfo -android-gfxinfo: - adb shell dumpsys gfxinfo com.mapbox.mapboxsdk.testapp reset - -# Generates Activity sanity tests -.PHONY: test-code-android -test-code-android: - node platform/android/scripts/generate-test-code.js - -# Runs checkstyle and lint on the java code -.PHONY: android-check -android-check : android-checkstyle run-android-nitpick android-lint-sdk android-lint-test-app android-ktlint - -# Runs checkstyle on the java code -.PHONY: android-checkstyle -android-checkstyle: platform/android/gradle/configuration.gradle - cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=none :MapboxGLAndroidSDK:checkstyle :MapboxGLAndroidSDKTestApp:checkstyle - -# Runs checkstyle on the kotlin code -.PHONY: android-ktlint -android-ktlint: - cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=none ktlint - -# Runs lint on the Android SDK java code -.PHONY: android-lint-sdk -android-lint-sdk: platform/android/gradle/configuration.gradle - cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=none :MapboxGLAndroidSDK:lint - -# Runs lint on the Android test app java code -.PHONY: android-lint-test-app -android-lint-test-app: platform/android/gradle/configuration.gradle - cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=none :MapboxGLAndroidSDKTestApp:lint - -# Generates javadoc from the Android SDK -.PHONY: android-javadoc -android-javadoc: platform/android/gradle/configuration.gradle - cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=none :MapboxGLAndroidSDK:javadocrelease - -# Generates platform/android/LICENSE.md file based on all Android project dependencies -.PHONY: android-license -android-license: platform/android/gradle/configuration.gradle - cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=none :MapboxGLAndroidSDK:licenseReleaseReport - python platform/android/scripts/generate-license.py - -# Symbolicate ndk stack traces for the arm-v7 abi -.PHONY: android-ndk-stack -android-ndk-stack: android-ndk-stack-arm-v7 - -# Open Android Studio if machine is macos -ifeq ($(HOST_PLATFORM), macos) -.PHONY: aproj -aproj: platform/android/gradle/configuration.gradle - open -b com.google.android.studio platform/android -endif - -# Creates the configuration needed to build with Android Studio -.PHONY: android-configuration -android-configuration: platform/android/gradle/configuration.gradle - cat platform/android/gradle/configuration.gradle - -# Updates Android's vendor submodules -.PHONY: android-update-vendor -android-update-vendor: platform/android/gradle/configuration.gradle - cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=none updateVendorSubmodules - -# Run android nitpick script -.PHONY: run-android-nitpick -run-android-nitpick: android-update-vendor - cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=none androidNitpick - -# Creates a dependency graph using Graphviz -.PHONY: android-graph -android-graph: platform/android/gradle/configuration.gradle - cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=none :MapboxGLAndroidSDK:generateDependencyGraphMapboxLibraries - -#### Miscellaneous targets ##################################################### - -.PHONY: style-code -style-code: - node scripts/generate-style-code.js - node scripts/generate-shaders.js - -.PHONY: codestyle -codestyle: - scripts/codestyle.sh - -.PHONY: clean -clean: - -rm -rf ./build \ - ./lib/*.node \ - ./platform/android/gradle/configuration.gradle \ - ./platform/android/MapboxGLAndroidSDK/build \ - ./platform/android/MapboxGLAndroidSDK/.externalNativeBuild \ - ./platform/android/MapboxGLAndroidSDKTestApp/build \ - ./platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/activity/gen \ - ./platform/android/MapboxGLAndroidSDK/src/main/assets \ - ./platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/integration - -.PHONY: distclean -distclean: clean - -rm -rf ./mason_packages - -rm -rf ./node_modules diff --git a/cmake/benchmark.cmake b/cmake/benchmark.cmake deleted file mode 100644 index a944c64d05..0000000000 --- a/cmake/benchmark.cmake +++ /dev/null @@ -1,30 +0,0 @@ -# Run scripts/generate-file-lists.js to change the source files for this target. -load_sources_list(MBGL_BENCHMARK_FILES benchmark/benchmark-files.json) -add_executable(mbgl-benchmark ${MBGL_BENCHMARK_FILES}) - -target_include_directories(mbgl-benchmark - PRIVATE src - PRIVATE benchmark/include - PRIVATE benchmark/src - PRIVATE platform/default/include -) - -target_link_libraries(mbgl-benchmark - PRIVATE mbgl-core - PRIVATE benchmark -) - -mbgl_platform_benchmark() - -create_source_groups(mbgl-benchmark) - -set_target_properties(mbgl-benchmark PROPERTIES FOLDER "Executables") - -initialize_xcode_cxx_build_settings(mbgl-benchmark) - -xcode_create_scheme( - TARGET mbgl-benchmark - OPTIONAL_ARGS - "--benchmark_filter=Category.*" - "--benchmark_repetitions=1" -) diff --git a/cmake/core.cmake b/cmake/core.cmake deleted file mode 100644 index abb55d174a..0000000000 --- a/cmake/core.cmake +++ /dev/null @@ -1,48 +0,0 @@ -# scripts/generate-file-lists.js to change the source files for this target. -load_sources_list(MBGL_CORE_FILES src/core-files.json) -add_library(mbgl-core STATIC ${MBGL_CORE_FILES}) - -target_include_directories(mbgl-core - PUBLIC include - PRIVATE src -) - -target_link_libraries(mbgl-core PRIVATE - earcut.hpp - eternal - expected - geojson-vt-cpp - kdbush.hpp - shelf-pack-cpp - supercluster.hpp - unique_resource - wagyu -) - -# linux uses ICU from mason, other platforms use vendored ICU -if(NOT MBGL_PLATFORM STREQUAL "linux") - set(ICU_LIBRARY "icu") -endif() - -# FIXME: We should not leak these many -# libraries in our public interface. -target_link_libraries(mbgl-core PUBLIC - boost - mapbox-base - geojson.hpp - ${ICU_LIBRARY} - polylabel - protozero - rapidjson - vector-tile -) - -mbgl_platform_core() - -create_source_groups(mbgl-core) - -set_target_properties(mbgl-core PROPERTIES FOLDER "Core") - -xcode_create_scheme(TARGET mbgl-core) - -initialize_xcode_cxx_build_settings(mbgl-core) diff --git a/cmake/doxygen.cmake b/cmake/doxygen.cmake deleted file mode 100644 index b61e878f88..0000000000 --- a/cmake/doxygen.cmake +++ /dev/null @@ -1,18 +0,0 @@ -find_package(Doxygen) -if(DOXYGEN_FOUND) - set(DOXYGEN_PROJECT_NAME "Mapbox GL Native") - set(DOXYGEN_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/docs") - set(DOXYGEN_GENERATE_XML TRUE) - set(DOXYGEN_QUIET YES) - set(DOXYGEN_WARN_LOGFILE ${CMAKE_BINARY_DIR}/doxygen_warn.log) - - doxygen_add_docs(generate_xml_doxygen - ${CMAKE_SOURCE_DIR}/include - ) - - add_custom_target(doxygen_coverage - COMMAND ${CMAKE_SOURCE_DIR}/scripts/doxy-coverage.py --quiet --noerror --json="${CMAKE_BINARY_DIR}/doxygen-coverage.json" "${CMAKE_BINARY_DIR}/docs/xml" - COMMENT "Checking documentation coverage" - DEPENDS generate_xml_doxygen - ) -endif() diff --git a/cmake/empty.cpp b/cmake/empty.cpp deleted file mode 100644 index e69de29bb2..0000000000 --- a/cmake/empty.cpp +++ /dev/null diff --git a/cmake/executable.xcscheme b/cmake/executable.xcscheme deleted file mode 100644 index 44146a621d..0000000000 --- a/cmake/executable.xcscheme +++ /dev/null @@ -1,102 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<Scheme - LastUpgradeVersion = "0830" - version = "1.3"> - <BuildAction - parallelizeBuildables = "YES" - buildImplicitDependencies = "YES"> - <BuildActionEntries> - <BuildActionEntry - buildForTesting = "YES" - buildForRunning = "YES" - buildForProfiling = "YES" - buildForArchiving = "YES" - buildForAnalyzing = "YES"> - <BuildableReference - BuildableIdentifier = "primary" - BlueprintIdentifier = "${XCSCHEME_BLUEPRINT_ID}" - BuildableName = "${XCSCHEME_BUILDABLE_NAME}" - BlueprintName = "${XCSCHEME_BLUEPRINT_NAME}" - ReferencedContainer = "container:${XCSCHEME_CONTAINER}"> - </BuildableReference> - </BuildActionEntry> - </BuildActionEntries> - </BuildAction> - <TestAction - buildConfiguration = "Debug" - selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" - selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - shouldUseLaunchSchemeArgsEnv = "YES"> - <Testables> - </Testables> - <MacroExpansion> - <BuildableReference - BuildableIdentifier = "primary" - BlueprintIdentifier = "${XCSCHEME_BLUEPRINT_ID}" - BuildableName = "${XCSCHEME_BUILDABLE_NAME}" - BlueprintName = "${XCSCHEME_BLUEPRINT_NAME}" - ReferencedContainer = "container:${XCSCHEME_CONTAINER}"> - </BuildableReference> - </MacroExpansion> - <AdditionalOptions> - </AdditionalOptions> - </TestAction> - <LaunchAction - buildConfiguration = "Debug" - selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" - selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - launchStyle = "0" - useCustomWorkingDirectory = "YES" - customWorkingDirectory = "${XCSCHEME_WORKING_DIRECTORY}" - ignoresPersistentStateOnLaunch = "NO" - debugDocumentVersioning = "YES" - debugServiceExtension = "internal" - allowLocationSimulation = "YES"> - <BuildableProductRunnable - runnableDebuggingMode = "0"> - <BuildableReference - BuildableIdentifier = "primary" - BlueprintIdentifier = "${XCSCHEME_BLUEPRINT_ID}" - BuildableName = "${XCSCHEME_BUILDABLE_NAME}" - BlueprintName = "${XCSCHEME_BLUEPRINT_NAME}" - ReferencedContainer = "container:${XCSCHEME_CONTAINER}"> - </BuildableReference> - </BuildableProductRunnable> - <CommandLineArguments>${XCSCHEME_COMMAND_LINE_ARGS} - </CommandLineArguments> - <EnvironmentVariables> - <EnvironmentVariable - key = "MAPBOX_ACCESS_TOKEN" - value = "$ENV{MAPBOX_ACCESS_TOKEN}" - isEnabled = "YES"> - </EnvironmentVariable> - </EnvironmentVariables> - <AdditionalOptions> - </AdditionalOptions> - </LaunchAction> - <ProfileAction - buildConfiguration = "Release" - shouldUseLaunchSchemeArgsEnv = "YES" - savedToolIdentifier = "" - useCustomWorkingDirectory = "YES" - customWorkingDirectory = "${XCSCHEME_WORKING_DIRECTORY}" - debugDocumentVersioning = "YES"> - <BuildableProductRunnable - runnableDebuggingMode = "0"> - <BuildableReference - BuildableIdentifier = "primary" - BlueprintIdentifier = "${XCSCHEME_BLUEPRINT_ID}" - BuildableName = "${XCSCHEME_BUILDABLE_NAME}" - BlueprintName = "${XCSCHEME_BLUEPRINT_NAME}" - ReferencedContainer = "container:${XCSCHEME_CONTAINER}"> - </BuildableReference> - </BuildableProductRunnable> - </ProfileAction> - <AnalyzeAction - buildConfiguration = "Debug"> - </AnalyzeAction> - <ArchiveAction - buildConfiguration = "Release" - revealArchiveInOrganizer = "YES"> - </ArchiveAction> -</Scheme> diff --git a/cmake/filesource.cmake b/cmake/filesource.cmake deleted file mode 100644 index ff9fa360f6..0000000000 --- a/cmake/filesource.cmake +++ /dev/null @@ -1,24 +0,0 @@ -# Modify platform/default/filesource-files.json to change the source files for this target. -load_sources_list(MBGL_FILESOURCE_FILES platform/default/filesource-files.json) -add_library(mbgl-filesource STATIC ${MBGL_FILESOURCE_FILES}) - -target_include_directories(mbgl-filesource - PRIVATE include - PRIVATE src - PRIVATE platform/default/include -) - -target_link_libraries(mbgl-filesource - PUBLIC mbgl-core - PUBLIC expected -) - -mbgl_filesource() - -create_source_groups(mbgl-filesource) - -set_target_properties(mbgl-filesource PROPERTIES FOLDER "Core") - -xcode_create_scheme(TARGET mbgl-filesource) - -initialize_xcode_cxx_build_settings(mbgl-filesource) diff --git a/cmake/glfw.cmake b/cmake/glfw.cmake deleted file mode 100644 index a4d9c30477..0000000000 --- a/cmake/glfw.cmake +++ /dev/null @@ -1,50 +0,0 @@ -add_executable(mbgl-glfw - platform/glfw/main.cpp -) - -target_sources(mbgl-glfw - PRIVATE platform/glfw/glfw_view.hpp - PRIVATE platform/glfw/glfw_view.cpp - PRIVATE platform/glfw/glfw_backend.hpp - PRIVATE platform/glfw/glfw_gl_backend.hpp - PRIVATE platform/glfw/glfw_gl_backend.cpp - PRIVATE platform/glfw/glfw_renderer_frontend.hpp - PRIVATE platform/glfw/glfw_renderer_frontend.cpp - PRIVATE platform/glfw/settings_json.hpp - PRIVATE platform/glfw/settings_json.cpp - PRIVATE platform/default/include/mbgl/util/default_styles.hpp -) - -target_include_directories(mbgl-glfw - PRIVATE platform/default/include -) - -target_link_libraries(mbgl-glfw - PRIVATE mbgl-core - PRIVATE glfw - PRIVATE cheap-ruler-cpp - PRIVATE args -) - -mbgl_platform_glfw() - -create_source_groups(mbgl-glfw) - -set_target_properties(mbgl-glfw PROPERTIES FOLDER "Executables") - -initialize_xcode_cxx_build_settings(mbgl-glfw) - -xcode_create_scheme( - TARGET mbgl-glfw - OPTIONAL_ARGS - "--style=file.json" - "--cache=/tmp/mbgl-cache.db" - "--lon=0" - "--lat=0" - "--zoom=1" - "--bearing=0" - "--pitch=0" - "--fullscreen" - "--offline" - "--benchmark" -) diff --git a/cmake/library.xcscheme b/cmake/library.xcscheme deleted file mode 100644 index 320a2f851f..0000000000 --- a/cmake/library.xcscheme +++ /dev/null @@ -1,80 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<Scheme - LastUpgradeVersion = "0830" - version = "1.3"> - <BuildAction - parallelizeBuildables = "YES" - buildImplicitDependencies = "YES"> - <BuildActionEntries> - <BuildActionEntry - buildForTesting = "YES" - buildForRunning = "YES" - buildForProfiling = "YES" - buildForArchiving = "YES" - buildForAnalyzing = "YES"> - <BuildableReference - BuildableIdentifier = "primary" - BlueprintIdentifier = "${XCSCHEME_BLUEPRINT_ID}" - BuildableName = "${XCSCHEME_BUILDABLE_NAME}" - BlueprintName = "${XCSCHEME_BLUEPRINT_NAME}" - ReferencedContainer = "container:${XCSCHEME_CONTAINER}"> - </BuildableReference> - </BuildActionEntry> - </BuildActionEntries> - </BuildAction> - <TestAction - buildConfiguration = "Debug" - selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" - selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - shouldUseLaunchSchemeArgsEnv = "YES"> - <Testables> - </Testables> - <AdditionalOptions> - </AdditionalOptions> - </TestAction> - <LaunchAction - buildConfiguration = "Debug" - selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" - selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - launchStyle = "0" - useCustomWorkingDirectory = "NO" - ignoresPersistentStateOnLaunch = "NO" - debugDocumentVersioning = "YES" - debugServiceExtension = "internal" - allowLocationSimulation = "YES"> - <MacroExpansion> - <BuildableReference - BuildableIdentifier = "primary" - BlueprintIdentifier = "${XCSCHEME_BLUEPRINT_ID}" - BuildableName = "${XCSCHEME_BUILDABLE_NAME}" - BlueprintName = "${XCSCHEME_BLUEPRINT_NAME}" - ReferencedContainer = "container:${XCSCHEME_CONTAINER}"> - </BuildableReference> - </MacroExpansion> - <AdditionalOptions> - </AdditionalOptions> - </LaunchAction> - <ProfileAction - buildConfiguration = "Release" - shouldUseLaunchSchemeArgsEnv = "YES" - savedToolIdentifier = "" - useCustomWorkingDirectory = "NO" - debugDocumentVersioning = "YES"> - <MacroExpansion> - <BuildableReference - BuildableIdentifier = "primary" - BlueprintIdentifier = "${XCSCHEME_BLUEPRINT_ID}" - BuildableName = "${XCSCHEME_BUILDABLE_NAME}" - BlueprintName = "${XCSCHEME_BLUEPRINT_NAME}" - ReferencedContainer = "container:${XCSCHEME_CONTAINER}"> - </BuildableReference> - </MacroExpansion> - </ProfileAction> - <AnalyzeAction - buildConfiguration = "Debug"> - </AnalyzeAction> - <ArchiveAction - buildConfiguration = "Release" - revealArchiveInOrganizer = "YES"> - </ArchiveAction> -</Scheme> diff --git a/cmake/loop-darwin.cmake b/cmake/loop-darwin.cmake deleted file mode 100644 index 9e52639c52..0000000000 --- a/cmake/loop-darwin.cmake +++ /dev/null @@ -1,20 +0,0 @@ -# Modify platform/darwin/loop-files.json to change the source files for this target. -load_sources_list(MBGL_LOOP_DARWIN_FILES platform/darwin/loop-files.json) -add_library(mbgl-loop-darwin STATIC ${MBGL_LOOP_DARWIN_FILES}) - -target_include_directories(mbgl-loop-darwin - PRIVATE include - PRIVATE src -) - -target_link_libraries(mbgl-loop-darwin PUBLIC - mapbox-base -) - -create_source_groups(mbgl-loop-darwin) - -set_target_properties(mbgl-loop-darwin PROPERTIES FOLDER "Core") - -initialize_xcode_cxx_build_settings(mbgl-loop-darwin) - -xcode_create_scheme(TARGET mbgl-loop-darwin) diff --git a/cmake/loop-uv.cmake b/cmake/loop-uv.cmake deleted file mode 100644 index 320545b3c3..0000000000 --- a/cmake/loop-uv.cmake +++ /dev/null @@ -1,14 +0,0 @@ -add_library(mbgl-loop-uv INTERFACE) - -target_sources(mbgl-loop-uv INTERFACE - ${CMAKE_CURRENT_SOURCE_DIR}/platform/default/src/mbgl/util/async_task.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/platform/default/src/mbgl/util/run_loop.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/platform/default/src/mbgl/util/timer.cpp -) - -target_include_directories(mbgl-loop-uv INTERFACE - ${CMAKE_CURRENT_SOURCE_DIR}/include - ${CMAKE_CURRENT_SOURCE_DIR}/src -) - -create_source_groups(mbgl-loop-uv) diff --git a/cmake/mason-dependencies.cmake b/cmake/mason-dependencies.cmake deleted file mode 100644 index 5ec6a44a79..0000000000 --- a/cmake/mason-dependencies.cmake +++ /dev/null @@ -1,25 +0,0 @@ -# All dependencies in a single separate file so its checksum can be used in a CI cache key name - -if(MBGL_PLATFORM STREQUAL "android") - # noop -elseif(MBGL_PLATFORM STREQUAL "ios") - # noop -elseif(MBGL_PLATFORM STREQUAL "linux") - mason_use(libuv VERSION 1.9.1) - mason_use(libpng VERSION 1.6.25) - mason_use(libjpeg-turbo VERSION 1.5.0) - mason_use(icu VERSION 63.1-min-static-data) - - if(WITH_EGL) - mason_use(swiftshader VERSION 2018-05-31) - endif() -elseif(MBGL_PLATFORM STREQUAL "macos") - if(WITH_EGL) - mason_use(swiftshader VERSION 2018-05-31) - endif() -elseif(MBGL_PLATFORM STREQUAL "qt") - if(NOT WITH_QT_DECODERS) - mason_use(libjpeg-turbo VERSION 1.5.0) - mason_use(libpng VERSION 1.6.25) - endif() -endif() diff --git a/cmake/mason.cmake b/cmake/mason.cmake deleted file mode 100644 index c0795d962c..0000000000 --- a/cmake/mason.cmake +++ /dev/null @@ -1,227 +0,0 @@ -# Mason CMake - -include(CMakeParseArguments) - -function(mason_detect_platform) - # Determine platform - if(NOT MASON_PLATFORM) - # we call uname -s manually here since - # CMAKE_HOST_SYSTEM_NAME will not be defined before the project() call - execute_process( - COMMAND uname -s - OUTPUT_VARIABLE UNAME - OUTPUT_STRIP_TRAILING_WHITESPACE) - - if (UNAME STREQUAL "Darwin") - set(MASON_PLATFORM "osx" PARENT_SCOPE) - else() - set(MASON_PLATFORM "linux" PARENT_SCOPE) - endif() - endif() - - # Determine platform version string - if(NOT MASON_PLATFORM_VERSION) - # Android Studio only passes ANDROID_ABI, but we need to adjust that to the Mason - if(MASON_PLATFORM STREQUAL "android" AND NOT MASON_PLATFORM_VERSION) - if (ANDROID_ABI STREQUAL "armeabi-v7a") - set(MASON_PLATFORM_VERSION "arm-v7-14" PARENT_SCOPE) - elseif (ANDROID_ABI STREQUAL "arm64-v8a") - set(MASON_PLATFORM_VERSION "arm-v8-21" PARENT_SCOPE) - elseif (ANDROID_ABI STREQUAL "x86") - set(MASON_PLATFORM_VERSION "x86-14" PARENT_SCOPE) - elseif (ANDROID_ABI STREQUAL "x86_64") - set(MASON_PLATFORM_VERSION "x86-64-21" PARENT_SCOPE) - else() - message(FATAL_ERROR "Unknown ANDROID_ABI '${ANDROID_ABI}'.") - endif() - elseif(MASON_PLATFORM STREQUAL "ios") - set(MASON_PLATFORM_VERSION "8.0" PARENT_SCOPE) - else() - execute_process( - COMMAND uname -m - OUTPUT_VARIABLE MASON_PLATFORM_VERSION - OUTPUT_STRIP_TRAILING_WHITESPACE) - set(MASON_PLATFORM_VERSION "${MASON_PLATFORM_VERSION}" PARENT_SCOPE) - endif() - endif() -endfunction() - -function(mason_use _PACKAGE) - if(NOT _PACKAGE) - message(FATAL_ERROR "[Mason] No package name given") - endif() - - cmake_parse_arguments("" "HEADER_ONLY" "VERSION" "" ${ARGN}) - - if(_UNPARSED_ARGUMENTS) - message(FATAL_ERROR "[Mason] mason_use() called with unrecognized arguments: ${_UNPARSED_ARGUMENTS}") - endif() - - if(NOT _VERSION) - message(FATAL_ERROR "[Mason] Specifying a version is required") - endif() - - if(MASON_PACKAGE_${_PACKAGE}_INVOCATION STREQUAL "${MASON_INVOCATION}") - # Check that the previous invocation of mason_use didn't select another version of this package - if(NOT MASON_PACKAGE_${_PACKAGE}_VERSION STREQUAL ${_VERSION}) - message(FATAL_ERROR "[Mason] Already using ${_PACKAGE} ${MASON_PACKAGE_${_PACKAGE}_VERSION}. Cannot select version ${_VERSION}.") - endif() - else() - if(_HEADER_ONLY) - set(_PLATFORM_ID "headers") - else() - set(_PLATFORM_ID "${MASON_PLATFORM}-${MASON_PLATFORM_VERSION}") - endif() - - set(_SLUG "${_PLATFORM_ID}/${_PACKAGE}/${_VERSION}") - set(_INSTALL_PATH "${MASON_PACKAGE_DIR}/${_SLUG}") - file(RELATIVE_PATH _INSTALL_PATH_RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${_INSTALL_PATH}") - - if(NOT EXISTS "${_INSTALL_PATH}") - set(_CACHE_PATH "${MASON_PACKAGE_DIR}/.binaries/${_SLUG}.tar.gz") - if (NOT EXISTS "${_CACHE_PATH}") - # Download the package - set(_URL "${MASON_REPOSITORY}/${_SLUG}.tar.gz") - message("[Mason] Downloading package ${_URL}...") - - set(_STATUS) - get_filename_component(_CACHE_DIR "${_CACHE_PATH}" DIRECTORY) - file(MAKE_DIRECTORY "${_CACHE_DIR}") - file(DOWNLOAD "${_URL}" "${_CACHE_PATH}.tmp" STATUS _STATUS TLS_VERIFY ON) - - list(GET _STATUS 0 _STATUS_CODE) - list(GET _STATUS 1 _STATUS_STRING) - if(NOT _STATUS_CODE EQUAL 0) - message(FATAL_ERROR "[Mason] Failed to download ${_URL}: ${_STATUS_STRING}") - else() - # We downloaded to a temporary file to prevent half-finished downloads - file(RENAME "${_CACHE_PATH}.tmp" "${_CACHE_PATH}") - endif() - endif() - - # Unpack the package - message("[Mason] Unpacking package to ${_INSTALL_PATH_RELATIVE}...") - file(MAKE_DIRECTORY "${_INSTALL_PATH}") - execute_process( - COMMAND ${CMAKE_COMMAND} -E tar xzf "${_CACHE_PATH}" - WORKING_DIRECTORY "${_INSTALL_PATH}") - endif() - - # Error out if there is no config file. - if(NOT EXISTS "${_INSTALL_PATH}/mason.ini") - message(FATAL_ERROR "[Mason] Could not find mason.ini for package ${_PACKAGE} ${_VERSION}") - endif() - - set(MASON_PACKAGE_${_PACKAGE}_PREFIX "${_INSTALL_PATH}" CACHE STRING "${_PACKAGE} ${_INSTALL_PATH}" FORCE) - mark_as_advanced(MASON_PACKAGE_${_PACKAGE}_PREFIX) - - # Load the configuration from the ini file - file(STRINGS "${_INSTALL_PATH}/mason.ini" _CONFIG_FILE) - foreach(_LINE IN LISTS _CONFIG_FILE) - string(REGEX MATCH "^([a-z_]+) *= *" _KEY "${_LINE}") - if (_KEY) - string(LENGTH "${_KEY}" _KEY_LENGTH) - string(SUBSTRING "${_LINE}" ${_KEY_LENGTH} -1 _VALUE) - string(REGEX REPLACE ";.*$" "" _VALUE "${_VALUE}") # Trim trailing commas - string(REPLACE "{prefix}" "${_INSTALL_PATH}" _VALUE "${_VALUE}") - string(STRIP "${_VALUE}" _VALUE) - string(REPLACE "=" "" _KEY "${_KEY}") - string(STRIP "${_KEY}" _KEY) - string(TOUPPER "${_KEY}" _KEY) - if(_KEY STREQUAL "INCLUDE_DIRS" OR _KEY STREQUAL "STATIC_LIBS" ) - separate_arguments(_VALUE) - endif() - set(MASON_PACKAGE_${_PACKAGE}_${_KEY} "${_VALUE}" CACHE STRING "${_PACKAGE} ${_KEY}" FORCE) - mark_as_advanced(MASON_PACKAGE_${_PACKAGE}_${_KEY}) - endif() - endforeach() - - # Compare version in the package to catch errors early on - if(NOT _VERSION STREQUAL MASON_PACKAGE_${_PACKAGE}_VERSION) - message(FATAL_ERROR "[Mason] Package at ${_INSTALL_PATH_RELATIVE} has version '${MASON_PACKAGE_${_PACKAGE}_VERSION}', but required '${_VERSION}'") - endif() - - if(NOT _PACKAGE STREQUAL MASON_PACKAGE_${_PACKAGE}_NAME) - message(FATAL_ERROR "[Mason] Package at ${_INSTALL_PATH_RELATIVE} has name '${MASON_PACKAGE_${_PACKAGE}_NAME}', but required '${_NAME}'") - endif() - - if(NOT _HEADER_ONLY) - if(NOT MASON_PLATFORM STREQUAL MASON_PACKAGE_${_PACKAGE}_PLATFORM) - message(FATAL_ERROR "[Mason] Package at ${_INSTALL_PATH_RELATIVE} has platform '${MASON_PACKAGE_${_PACKAGE}_PLATFORM}', but required '${MASON_PLATFORM}'") - endif() - - if(NOT MASON_PLATFORM_VERSION STREQUAL MASON_PACKAGE_${_PACKAGE}_PLATFORM_VERSION) - message(FATAL_ERROR "[Mason] Package at ${_INSTALL_PATH_RELATIVE} has platform version '${MASON_PACKAGE_${_PACKAGE}_PLATFORM_VERSION}', but required '${MASON_PLATFORM_VERSION}'") - endif() - endif() - - # Concatenate the static libs and libraries - set(_LIBRARIES) - list(APPEND _LIBRARIES ${MASON_PACKAGE_${_PACKAGE}_STATIC_LIBS} ${MASON_PACKAGE_${_PACKAGE}_LDFLAGS}) - set(MASON_PACKAGE_${_PACKAGE}_LIBRARIES "${_LIBRARIES}" CACHE STRING "${_PACKAGE} _LIBRARIES" FORCE) - mark_as_advanced(MASON_PACKAGE_${_PACKAGE}_LIBRARIES) - - if(NOT _HEADER_ONLY) - string(REGEX MATCHALL "(^| +)-L *([^ ]+)" MASON_PACKAGE_${_PACKAGE}_LIBRARY_DIRS "${MASON_PACKAGE_${_PACKAGE}_LDFLAGS}") - string(REGEX REPLACE "(^| +)-L *" "\\1" MASON_PACKAGE_${_PACKAGE}_LIBRARY_DIRS "${MASON_PACKAGE_${_PACKAGE}_LIBRARY_DIRS}") - set(MASON_PACKAGE_${_PACKAGE}_LIBRARY_DIRS "${MASON_PACKAGE_${_PACKAGE}_LIBRARY_DIRS}" CACHE STRING "${_PACKAGE} ${MASON_PACKAGE_${_PACKAGE}_LIBRARY_DIRS}" FORCE) - mark_as_advanced(MASON_PACKAGE_${_PACKAGE}_LIBRARY_DIRS) - endif() - - # Store invocation ID to prevent different versions of the same package in one invocation - set(MASON_PACKAGE_${_PACKAGE}_INVOCATION "${MASON_INVOCATION}" CACHE INTERNAL "${_PACKAGE} invocation ID" FORCE) - endif() -endfunction() - -macro(target_add_mason_package _TARGET _VISIBILITY _PACKAGE) - if (NOT MASON_PACKAGE_${_PACKAGE}_INVOCATION) - message(FATAL_ERROR "[Mason] Package ${_PACKAGE} has not been initialized yet") - endif() - - target_include_directories(${_TARGET} ${_VISIBILITY} "${MASON_PACKAGE_${_PACKAGE}_INCLUDE_DIRS}") - target_compile_definitions(${_TARGET} ${_VISIBILITY} "${MASON_PACKAGE_${_PACKAGE}_DEFINITIONS}") - target_compile_options(${_TARGET} ${_VISIBILITY} "${MASON_PACKAGE_${_PACKAGE}_OPTIONS}") - target_link_libraries(${_TARGET} ${_VISIBILITY} "${MASON_PACKAGE_${_PACKAGE}_LIBRARIES}") -endmacro() - -# Setup - -string(RANDOM LENGTH 16 MASON_INVOCATION) - -# Read environment variables if CMake is run in command mode -if (CMAKE_ARGC) - set(MASON_PLATFORM "$ENV{MASON_PLATFORM}") - set(MASON_PLATFORM_VERSION "$ENV{MASON_PLATFORM_VERSION}") - set(MASON_PACKAGE_DIR "$ENV{MASON_PACKAGE_DIR}") - set(MASON_REPOSITORY "$ENV{MASON_REPOSITORY}") -endif() - -# Directory where Mason packages are located; typically ends with mason_packages -if (NOT MASON_PACKAGE_DIR) - set(MASON_PACKAGE_DIR "${CMAKE_SOURCE_DIR}/mason_packages") -endif() - -# URL prefix of where packages are located. -if (NOT MASON_REPOSITORY) - set(MASON_REPOSITORY "https://mason-binaries.s3.amazonaws.com") -endif() - -mason_detect_platform() - -# Execute commands if CMake is run in command mode\ -if (CMAKE_ARGC AND "${CMAKE_SCRIPT_MODE_FILE}" STREQUAL "${CMAKE_CURRENT_LIST_DIR}/mason.cmake") - # Collect remaining arguments for passing to mason_use - set(_MASON_ARGS) - foreach(I RANGE 4 ${CMAKE_ARGC}) - list(APPEND _MASON_ARGS "${CMAKE_ARGV${I}}") - endforeach() - - # Install the package - mason_use(${_MASON_ARGS}) - - # Optionally print variables - if(DEFINED MASON_PACKAGE_${CMAKE_ARGV4}_${CMAKE_ARGV3}) - # CMake can't write to stdout with message() - execute_process(COMMAND ${CMAKE_COMMAND} -E echo "${MASON_PACKAGE_${CMAKE_ARGV4}_${CMAKE_ARGV3}}") - endif() -endif() diff --git a/cmake/mbgl.cmake b/cmake/mbgl.cmake deleted file mode 100644 index 1b4338a0bb..0000000000 --- a/cmake/mbgl.cmake +++ /dev/null @@ -1,232 +0,0 @@ -if (NOT MBGL_PLATFORM) - if (CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") - set(MBGL_PLATFORM "macos") - else() - set(MBGL_PLATFORM "linux") - endif() -endif() - -if(WITH_NODEJS) - find_program(NodeJS_EXECUTABLE NAMES nodejs node) - if (NOT NodeJS_EXECUTABLE) - message(FATAL_ERROR "Could not find Node.js") - endif() - - find_program(npm_EXECUTABLE NAMES npm) - if (NOT npm_EXECUTABLE) - message(FATAL_ERROR "Could not find npm") - endif() - - execute_process( - COMMAND "${NodeJS_EXECUTABLE}" -e "process.stdout.write(process.versions.node)" - RESULT_VARIABLE _STATUS_CODE - OUTPUT_VARIABLE NodeJS_VERSION - ERROR_VARIABLE _STATUS_MESSAGE - ) - if(NOT _STATUS_CODE EQUAL 0) - message(FATAL_ERROR "Could not detect Node.js version: ${_STATUS_MESSAGE}") - endif() - - execute_process( - COMMAND "${NodeJS_EXECUTABLE}" -e "process.stdout.write(process.versions.modules)" - RESULT_VARIABLE _STATUS_CODE - OUTPUT_VARIABLE NodeJS_ABI - ERROR_VARIABLE _STATUS_MESSAGE - ) - if(NOT _STATUS_CODE EQUAL 0) - message(FATAL_ERROR "Could not detect Node.js ABI version: ${_STATUS_MESSAGE}") - endif() - - function(_npm_install DIRECTORY NAME ADDITIONAL_DEPS) - SET(NPM_INSTALL_FAILED FALSE) - if("${DIRECTORY}/package.json" IS_NEWER_THAN "${DIRECTORY}/node_modules/.${NAME}.stamp") - message(STATUS "Running 'npm install' for ${NAME}...") - execute_process( - COMMAND "${NodeJS_EXECUTABLE}" "${npm_EXECUTABLE}" install --verbose --ignore-scripts - WORKING_DIRECTORY "${DIRECTORY}" - RESULT_VARIABLE NPM_INSTALL_FAILED - OUTPUT_VARIABLE NPM_OUTPUT - ERROR_VARIABLE NPM_OUTPUT) - message(STATUS "Finished 'npm install' for ${NAME}...") - if(NOT NPM_INSTALL_FAILED) - execute_process(COMMAND ${CMAKE_COMMAND} -E touch "${DIRECTORY}/node_modules/.${NAME}.stamp") - else() - message(FATAL_ERROR "NPM install failed:\n${NPM_OUTPUT}") - endif() - endif() - - add_custom_command( - OUTPUT "${DIRECTORY}/node_modules/.${NAME}.stamp" - COMMAND "${NodeJS_EXECUTABLE}" "${npm_EXECUTABLE}" install --ignore-scripts - COMMAND ${CMAKE_COMMAND} -E touch "${DIRECTORY}/node_modules/.${NAME}.stamp" - WORKING_DIRECTORY "${DIRECTORY}" - DEPENDS ${ADDITIONAL_DEPS} "${DIRECTORY}/package.json" - COMMENT "Running 'npm install' for ${NAME}...") - endfunction() - - # Run submodule update - set(MBGL_SUBMODULES mapbox-gl-js) - if(MBGL_PLATFORM STREQUAL "ios") - list(APPEND MBGL_SUBMODULES platform/ios/vendor/mapbox-events-ios) - endif() - if(MBGL_PLATFORM STREQUAL "ios" OR MBGL_PLATFORM STREQUAL "macos") - list(APPEND MBGL_SUBMODULES platform/darwin/docs/theme) - endif() - - message(STATUS "Updating submodules...") - execute_process( - COMMAND git submodule update --init ${MBGL_SUBMODULES} - WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}") - - if(NOT EXISTS "${CMAKE_SOURCE_DIR}/mapbox-gl-js/node_modules") - # Symlink mapbox-gl-js/node_modules so that the modules that are - # about to be installed get cached between CI runs. - execute_process( - COMMAND ln -sF ../node_modules . - WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/mapbox-gl-js") - endif() - - # Add target for running submodule update during builds - add_custom_target( - update-submodules ALL - COMMAND git submodule update --init ${MBGL_SUBMODULES} - WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" - COMMENT "Updating submodules..." - ) - set_target_properties(update-submodules PROPERTIES FOLDER "Misc") - - # Run npm install for both directories, and add custom commands, and a target that depends on them. - _npm_install("${CMAKE_SOURCE_DIR}" mapbox-gl-native update-submodules) - _npm_install("${CMAKE_SOURCE_DIR}/mapbox-gl-js/test/integration" mapbox-gl-js "${CMAKE_SOURCE_DIR}/node_modules/.mapbox-gl-native.stamp") - add_custom_target( - npm-install ALL - DEPENDS "${CMAKE_SOURCE_DIR}/node_modules/.mapbox-gl-js.stamp" - ) - set_target_properties(npm-install PROPERTIES FOLDER "Misc") -endif() - -# Generate source groups so the files are properly sorted in IDEs like Xcode. -function(create_source_groups target) - get_target_property(type ${target} TYPE) - if(type AND type STREQUAL "INTERFACE_LIBRARY") - get_target_property(sources ${target} INTERFACE_SOURCES) - else() - get_target_property(sources ${target} SOURCES) - endif() - foreach(file ${sources}) - get_filename_component(file "${file}" ABSOLUTE) - string(REGEX REPLACE "^${CMAKE_SOURCE_DIR}/" "" group "${file}") - get_filename_component(group "${group}" DIRECTORY) - string(REPLACE "/" "\\" group "${group}") - source_group("${group}" FILES "${file}") - endforeach() -endfunction() - -function(load_sources_list VAR FILELIST) - set(_FILES) - file(READ "${FILELIST}" _LINES) - # Note: this isn't really parsing JSON, but it's good enough for our purposes. - set(_REGEX "(^|\n) *(\"([^\"]+)\" *: *)?\"([^\"]+)\",?(\n|$)") - string(REGEX MATCHALL "${_REGEX}" _MATCHES "${_LINES}") - foreach(_MATCH IN LISTS _MATCHES) - string(REGEX MATCH "${_REGEX}" _FILE "${_MATCH}") - if (_FILE AND NOT CMAKE_MATCH_3 STREQUAL "//") - list(APPEND _FILES "${CMAKE_SOURCE_DIR}/${CMAKE_MATCH_4}") - endif() - endforeach() - set(${VAR} "${_FILES}" PARENT_SCOPE) - set_property(DIRECTORY "${CMAKE_SOURCE_DIR}" APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS "${FILELIST}") -endfunction() - -function(target_sources_from_file TARGET TYPE FILELIST) - load_sources_list(_FILELIST "${FILELIST}") - target_sources(${TARGET} ${TYPE} "${_FILELIST}") -endfunction() - -# Creates a library target for a vendored dependency -function(add_vendor_target NAME TYPE) - set(INCLUDE_TYPE "INTERFACE") - set(SOURCE_TYPE "INTERFACE") - if (TYPE STREQUAL "STATIC" OR TYPE STREQUAL "SHARED") - add_library(${NAME} ${TYPE} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/empty.cpp") - set(INCLUDE_TYPE "PUBLIC") - set(SOURCE_TYPE "PRIVATE") - set_target_properties(${NAME} PROPERTIES SOURCES "") - else() - add_library(${NAME} ${TYPE}) - endif() - set_target_properties(${NAME} PROPERTIES INTERFACE_SOURCES "") - file(STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/vendor/${NAME}/files.txt" FILES) - foreach(FILE IN LISTS FILES) - target_sources(${NAME} ${SOURCE_TYPE} "${CMAKE_CURRENT_SOURCE_DIR}/vendor/${NAME}/${FILE}") - endforeach() - target_include_directories(${NAME} SYSTEM ${INCLUDE_TYPE} "${CMAKE_CURRENT_SOURCE_DIR}/vendor/${NAME}/include") - create_source_groups(${NAME}) -endfunction() - -# This little macro lets you set any XCode specific property -macro(set_xcode_property TARGET XCODE_PROPERTY XCODE_VALUE) - set_property(TARGET ${TARGET} PROPERTY XCODE_ATTRIBUTE_${XCODE_PROPERTY} ${XCODE_VALUE}) -endmacro (set_xcode_property) - -function(set_xcconfig_target_properties target) - # Create a list of linked libraries for use in the xcconfig generation script. - get_property(result TARGET ${target} PROPERTY INTERFACE_LINK_LIBRARIES) - string(GENEX_STRIP "${result}" result) - # Remove target names from the list of linker flags, since Xcode can't deal with them. - set(link_flags) - foreach(item IN LISTS result) - if (NOT TARGET ${item}) - list(APPEND link_flags ${item}) - endif() - endforeach() - string(REGEX REPLACE "(^|;)-framework " "\\1-framework;" link_flags "${link_flags}") - string(REPLACE ";" "\" \"" link_flags "${link_flags}") - set_xcode_property(${target} XCCONFIG_LINK_LIBRARIES "${link_flags}") -endfunction() - -# Set Xcode project build settings to be consistent with the CXX flags we're -# using. (Otherwise, Xcode's defaults may override some of these.) -function(initialize_xcode_cxx_build_settings target) - # -Wall - set_xcode_property(${target} GCC_WARN_SIGN_COMPARE YES) - set_xcode_property(${target} GCC_WARN_UNINITIALIZED_AUTOS YES) - set_xcode_property(${target} GCC_WARN_UNKNOWN_PRAGMAS YES) - set_xcode_property(${target} GCC_WARN_UNUSED_FUNCTION YES) - set_xcode_property(${target} GCC_WARN_UNUSED_LABEL YES) - set_xcode_property(${target} GCC_WARN_UNUSED_PARAMETER YES) - set_xcode_property(${target} GCC_WARN_UNUSED_VARIABLE YES) - - # -Wextra - set_xcode_property(${target} CLANG_WARN_EMPTY_BODY YES) - set_xcode_property(${target} GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS YES) - - # -Wshadow - set_xcode_property(${target} GCC_WARN_SHADOW YES) - - # -Wnon-virtual-dtor - set_xcode_property(${target} GCC_WARN_NON_VIRTUAL_DESTRUCTOR YES) - - # -Wnon-literal-conversion - set_xcode_property(${target} CLANG_WARN_NON_LITERAL_NULL_CONVERSION YES) - - # -Wrange-loop-analysis - set_xcode_property(${target} CLANG_WARN_RANGE_LOOP_ANALYSIS YES) - - # -flto - set_xcode_property(${target} LLVM_LTO $<$<OR:$<CONFIG:Release>,$<CONFIG:RelWithDebInfo>>:YES>) - - # Make all build configurations debuggable — except Release. - set_xcode_property(${target} GCC_GENERATE_DEBUGGING_SYMBOLS $<$<NOT:$<CONFIG:Release>>:YES>) - - # -Wunguarded-availability - set_xcode_property(${target} CLANG_WARN_UNGUARDED_AVAILABILITY YES_AGGRESSIVE) - - if (DEFINED ENV{CI}) - set_xcode_property(${target} COMPILER_INDEX_STORE_ENABLE NO) - endif() -endfunction() - -# CMake 3.1 does not have this yet. -set(CMAKE_CXX14_STANDARD_COMPILE_OPTION "-std=c++14") -set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "-std=gnu++14") diff --git a/cmake/node.cmake b/cmake/node.cmake deleted file mode 100644 index a791d99b42..0000000000 --- a/cmake/node.cmake +++ /dev/null @@ -1,142 +0,0 @@ -# Load Node.js -set(NODE_MODULE_CACHE_DIR "${CMAKE_SOURCE_DIR}/build/headers") -include(node_modules/@mapbox/cmake-node-module/module.cmake) - -add_library(mbgl-loop-node INTERFACE) - -target_sources(mbgl-loop-node INTERFACE - ${CMAKE_CURRENT_SOURCE_DIR}/platform/default/src/mbgl/util/async_task.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/platform/default/src/mbgl/util/run_loop.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/platform/default/src/mbgl/util/timer.cpp -) - -target_include_directories(mbgl-loop-node INTERFACE - ${CMAKE_CURRENT_SOURCE_DIR}/include - ${CMAKE_CURRENT_SOURCE_DIR}/src -) - -create_source_groups(mbgl-loop-node) - - -add_node_module(mbgl-node - INSTALL_PATH "lib/{node_abi}/mbgl.node" - NAN_VERSION "2.10.0" - - # Don't build for Node 4.x, 5.x, 7.x, 9.x, 11.x and 12.x - # See https://nodejs.org/en/download/releases/ for mapping of Node version to ABI number. - # Changes to this property should happen in tandem with updates to the version targets - # in platform/node/scripts/publish.sh and the "node" engines property in package.json. - EXCLUDE_NODE_ABIS 46 47 51 59 67 72 -) - -target_sources(mbgl-node INTERFACE - ${CMAKE_CURRENT_SOURCE_DIR}/platform/node/src/node_mapbox_gl_native.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/platform/node/src/node_mapbox_gl_native.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/platform/node/src/node_logging.hpp - ${CMAKE_CURRENT_SOURCE_DIR}/platform/node/src/node_logging.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/platform/node/src/node_conversion.hpp - ${CMAKE_CURRENT_SOURCE_DIR}/platform/node/src/node_map.hpp - ${CMAKE_CURRENT_SOURCE_DIR}/platform/node/src/node_map.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/platform/node/src/node_request.hpp - ${CMAKE_CURRENT_SOURCE_DIR}/platform/node/src/node_request.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/platform/node/src/node_feature.hpp - ${CMAKE_CURRENT_SOURCE_DIR}/platform/node/src/node_feature.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/platform/node/src/node_expression.hpp - ${CMAKE_CURRENT_SOURCE_DIR}/platform/node/src/node_expression.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/platform/node/src/util/async_queue.hpp -) - -target_include_directories(mbgl-node INTERFACE - ${CMAKE_CURRENT_SOURCE_DIR}/platform/default/include -) - -target_link_libraries(mbgl-node INTERFACE - mbgl-core - mbgl-loop-node -) - -set_target_properties(mbgl-node.all PROPERTIES FOLDER "Node.js") - -add_custom_target(mbgl-node.active DEPENDS mbgl-node.abi-${NodeJS_ABI}) -set_target_properties(mbgl-node.active PROPERTIES FOLDER "Node.js") - -mbgl_platform_node() - -create_source_groups(mbgl-node) - -foreach(ABI IN LISTS mbgl-node::abis) - initialize_xcode_cxx_build_settings(mbgl-node.abi-${ABI}) - set_target_properties(mbgl-node.abi-${ABI} PROPERTIES FOLDER "Node.js") - xcode_create_scheme( - TARGET mbgl-node.abi-${ABI} - NAME "mbgl-node (ABI ${ABI})" - ) -endforeach() - -xcode_create_scheme( - TARGET mbgl-node.active - TYPE library - NAME "mbgl-node (Active ABI)" -) - -xcode_create_scheme( - TARGET mbgl-node.all - TYPE library - NAME "mbgl-node (All ABIs)" -) - -xcode_create_scheme( - TARGET mbgl-node.active - TYPE node - NAME "node tests (Active ABI)" - ARGS - "node_modules/.bin/tape platform/node/test/js/**/*.test.js" -) - -xcode_create_scheme( - TARGET mbgl-node.active - TYPE node - NAME "node render tests (Active ABI)" - ARGS - "-r esm" - "platform/node/test/render.test.js" - OPTIONAL_ARGS - "group" - "test" -) - -xcode_create_scheme( - TARGET mbgl-node.active - TYPE node - NAME "node query tests (Active ABI)" - ARGS - "-r esm" - "platform/node/test/query.test.js" - OPTIONAL_ARGS - "group" - "test" -) - -xcode_create_scheme( - TARGET mbgl-node.active - TYPE node - NAME "node expression tests (Active ABI)" - ARGS - "-r esm" - "platform/node/test/expression.test.js" - OPTIONAL_ARGS - "group" - "test" -) - -xcode_create_scheme( - TARGET mbgl-node.active - TYPE node - NAME "node-benchmark (Active ABI)" - ARGS - "-r esm" - "platform/node/test/benchmark.js" - OPTIONAL_ARGS - "group" - "test" -) diff --git a/cmake/node.xcscheme b/cmake/node.xcscheme deleted file mode 100644 index d873a3d615..0000000000 --- a/cmake/node.xcscheme +++ /dev/null @@ -1,102 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<Scheme - LastUpgradeVersion = "0810" - version = "1.3"> - <BuildAction - parallelizeBuildables = "YES" - buildImplicitDependencies = "YES"> - <BuildActionEntries> - <BuildActionEntry - buildForTesting = "YES" - buildForRunning = "YES" - buildForProfiling = "YES" - buildForArchiving = "YES" - buildForAnalyzing = "YES"> - <BuildableReference - BuildableIdentifier = "primary" - BlueprintIdentifier = "${XCSCHEME_BLUEPRINT_ID}" - BuildableName = "${XCSCHEME_BUILDABLE_NAME}" - BlueprintName = "${XCSCHEME_BLUEPRINT_NAME}" - ReferencedContainer = "container:${XCSCHEME_CONTAINER}"> - </BuildableReference> - </BuildActionEntry> - </BuildActionEntries> - </BuildAction> - <TestAction - buildConfiguration = "Debug" - selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" - selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - shouldUseLaunchSchemeArgsEnv = "YES"> - <Testables> - </Testables> - <AdditionalOptions> - </AdditionalOptions> - </TestAction> - <LaunchAction - buildConfiguration = "Debug" - selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" - selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - launchStyle = "0" - useCustomWorkingDirectory = "YES" - customWorkingDirectory = "${XCSCHEME_WORKING_DIRECTORY}" - ignoresPersistentStateOnLaunch = "NO" - debugDocumentVersioning = "YES" - debugServiceExtension = "internal" - allowLocationSimulation = "YES"> - <PathRunnable - runnableDebuggingMode = "0" - FilePath = "${XCSCHEME_NODE_EXECUTABLE}"> - </PathRunnable> - <MacroExpansion> - <BuildableReference - BuildableIdentifier = "primary" - BlueprintIdentifier = "${XCSCHEME_BLUEPRINT_ID}" - BuildableName = "${XCSCHEME_BUILDABLE_NAME}" - BlueprintName = "${XCSCHEME_BLUEPRINT_NAME}" - ReferencedContainer = "container:${XCSCHEME_CONTAINER}"> - </BuildableReference> - </MacroExpansion> - <CommandLineArguments>${XCSCHEME_COMMAND_LINE_ARGS} - </CommandLineArguments> - <EnvironmentVariables> - <EnvironmentVariable - key = "PATH" - value = "${XCSCHEME_NODE_PATH}:$PATH" - isEnabled = "YES"> - </EnvironmentVariable> - </EnvironmentVariables> - </LaunchAction> - <ProfileAction - buildConfiguration = "Release" - shouldUseLaunchSchemeArgsEnv = "YES" - selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" - selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - launchStyle = "0" - useCustomWorkingDirectory = "YES" - customWorkingDirectory = "${XCSCHEME_WORKING_DIRECTORY}" - ignoresPersistentStateOnLaunch = "NO" - debugServiceExtension = "internal" - allowLocationSimulation = "YES" - debugDocumentVersioning = "YES"> - <PathRunnable - runnableDebuggingMode = "0" - FilePath = "${XCSCHEME_NODE_EXECUTABLE}"> - </PathRunnable> - <MacroExpansion> - <BuildableReference - BuildableIdentifier = "primary" - BlueprintIdentifier = "${XCSCHEME_BLUEPRINT_ID}" - BuildableName = "${XCSCHEME_BUILDABLE_NAME}" - BlueprintName = "${XCSCHEME_BLUEPRINT_NAME}" - ReferencedContainer = "container:${XCSCHEME_CONTAINER}"> - </BuildableReference> - </MacroExpansion> - </ProfileAction> - <AnalyzeAction - buildConfiguration = "Debug"> - </AnalyzeAction> - <ArchiveAction - buildConfiguration = "Release" - revealArchiveInOrganizer = "YES"> - </ArchiveAction> -</Scheme> diff --git a/cmake/offline.cmake b/cmake/offline.cmake deleted file mode 100644 index 3fa075f07b..0000000000 --- a/cmake/offline.cmake +++ /dev/null @@ -1,39 +0,0 @@ -add_executable(mbgl-offline - bin/offline.cpp -) - -target_sources(mbgl-offline - PRIVATE platform/default/include/mbgl/util/default_styles.hpp -) - -target_include_directories(mbgl-offline - PRIVATE platform/default/include -) - -target_link_libraries(mbgl-offline - PRIVATE mbgl-core - PRIVATE args -) - -mbgl_platform_offline() - -create_source_groups(mbgl-offline) - -initialize_xcode_cxx_build_settings(mbgl-offline) - -set_target_properties(mbgl-offline PROPERTIES FOLDER "Executables") - -xcode_create_scheme( - TARGET mbgl-offline - OPTIONAL_ARGS - "--style=file.json" - "--north=37.2" - "--west=-122.8" - "--south=38.1" - "--east=-121.7" - "--minZoom=0.0" - "--maxZoom=15.0" - "--pixelRatio=1.0" - "--token=" - "--output=offline.db" -) diff --git a/cmake/render-test.cmake b/cmake/render-test.cmake deleted file mode 100644 index 6505cc73f8..0000000000 --- a/cmake/render-test.cmake +++ /dev/null @@ -1,29 +0,0 @@ -add_executable(mbgl-render-test - render-test/main.cpp - render-test/parser.cpp - render-test/runner.cpp -) - -if(APPLE) - target_link_libraries(mbgl-render-test PRIVATE mbgl-loop-darwin) -else() - target_link_libraries(mbgl-render-test PRIVATE mbgl-loop-uv) -endif() - -target_include_directories(mbgl-render-test - PRIVATE src - PRIVATE platform/default/include - PRIVATE render-test -) - -target_link_libraries(mbgl-render-test PRIVATE - mbgl-core - mbgl-filesource - args - expected - filesystem - pixelmatch-cpp - rapidjson -) - -add_definitions(-DTEST_RUNNER_ROOT_PATH="${CMAKE_SOURCE_DIR}") diff --git a/cmake/render.cmake b/cmake/render.cmake deleted file mode 100644 index a625b3f21f..0000000000 --- a/cmake/render.cmake +++ /dev/null @@ -1,39 +0,0 @@ -add_executable(mbgl-render - bin/render.cpp -) - -target_include_directories(mbgl-render - PRIVATE platform/default/include -) - -target_link_libraries(mbgl-render - PRIVATE mbgl-core - PRIVATE args -) - -mbgl_platform_render() - -create_source_groups(mbgl-render) - -initialize_xcode_cxx_build_settings(mbgl-render) - -set_target_properties(mbgl-render PROPERTIES FOLDER "Executables") - -xcode_create_scheme( - TARGET mbgl-render - OPTIONAL_ARGS - "--style=file.json" - "--lon=0" - "--lat=0" - "--zoom=0" - "--bearing=0" - "--pitch=0" - "--width=512" - "--height=512" - "--ratio=1" - "--token=" - "--debug" - "--output=out.png" - "--cache=cache.sqlite" - "--assets=." -) diff --git a/cmake/sqlite.cmake b/cmake/sqlite.cmake deleted file mode 100644 index cc579b22ac..0000000000 --- a/cmake/sqlite.cmake +++ /dev/null @@ -1,47 +0,0 @@ -add_vendor_target(sqlite STATIC) - -target_compile_definitions(sqlite - PRIVATE "-DVERSION=\"3.24.0\"" - PRIVATE "-DSTDC_HEADERS=int" - PRIVATE "-DHAVE_SYS_TYPES_H=1" - PRIVATE "-DHAVE_SYS_STAT_H=1" - PRIVATE "-DHAVE_STDLIB_H=1" - PRIVATE "-DHAVE_STRING_H=1" - PRIVATE "-DHAVE_MEMORY_H=1" - PRIVATE "-DHAVE_STRINGS_H=1" - PRIVATE "-DHAVE_INTTYPES_H=1" - PRIVATE "-DHAVE_STDINT_H=1" - PRIVATE "-DHAVE_UNISTD_H=1" - PRIVATE "-DHAVE_DLFCN_H=1" - PRIVATE "-DHAVE_FDATASYNC=1" - PRIVATE "-DHAVE_USLEEP=1" - PRIVATE "-DHAVE_LOCALTIME_R=1" - PRIVATE "-DHAVE_GMTIME_R=1" - PRIVATE "-DHAVE_DECL_STRERROR_R=1" - PRIVATE "-DHAVE_STRERROR_R=1" - PRIVATE "-DHAVE_ZLIB_H=1" - PRIVATE "-D_REENTRANT=1" - PRIVATE "-DSQLITE_THREADSAFE=1" - PRIVATE "-DSQLITE_HAVE_ZLIB" - - # These are disabled on purpose, since we're not using these features. - # PRIVATE "-DSQLITE_ENABLE_FTS5" - # PRIVATE "-DSQLITE_ENABLE_JSON1" - # PRIVATE "-DSQLITE_ENABLE_FTS3" - # PRIVATE "-DSQLITE_ENABLE_RTREE" -) - -target_compile_options(sqlite - PRIVATE "-Wno-int-conversion" - PRIVATE "-Wno-implicit-fallthrough" -) - -if(CMAKE_COMPILER_IS_GNUCXX) - if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 8.0) - target_compile_options(sqlite PRIVATE "-Wno-cast-function-type") - else() - target_compile_options(sqlite PRIVATE "-Wno-bad-function-cast") - endif() -elseif(CMAKE_CXX_COMPILER_ID MATCHES ".*Clang") - target_compile_options(sqlite PRIVATE "-Wno-cast-function-type") -endif() diff --git a/cmake/test.cmake b/cmake/test.cmake deleted file mode 100644 index 1c1d3269a7..0000000000 --- a/cmake/test.cmake +++ /dev/null @@ -1,51 +0,0 @@ -# scripts/generate-file-lists.js to change the source files for this target. -load_sources_list(MBGL_TEST_FILES test/test-files.json) -if (MBGL_TEST_TARGET_TYPE STREQUAL "library") - add_library(mbgl-test SHARED ${MBGL_TEST_FILES}) -else() - add_executable(mbgl-test ${MBGL_TEST_FILES}) -endif() - -# GCC 8+ trips over GTest's way of defining Test functions -target_compile_options(mbgl-test PRIVATE -Wno-shadow) - -if(NOT WITH_NODEJS) - target_compile_definitions(mbgl-test PRIVATE "-DTEST_HAS_SERVER=0") -endif() - -set_source_files_properties(test/src/mbgl/test/util.cpp PROPERTIES COMPILE_FLAGS -DNODE_EXECUTABLE="${NodeJS_EXECUTABLE}") - -target_include_directories(mbgl-test - PRIVATE src - PRIVATE test/include - PRIVATE test/src - PRIVATE platform/default/include -) - -target_link_libraries(mbgl-test PRIVATE - googletest - args - mbgl-core - shelf-pack-cpp - unique_resource - pixelmatch-cpp -) - -mbgl_platform_test() - -create_source_groups(mbgl-test) - -initialize_xcode_cxx_build_settings(mbgl-test) - -set_target_properties(mbgl-test PROPERTIES FOLDER "Executables") - -xcode_create_scheme( - TARGET mbgl-test - OPTIONAL_ARGS - "--gtest_filter=Category.*" - "--gtest_repeat=0" - "--gtest_shuffle=0" - "--gtest_break_on_failure=0" - "--gtest_throw_on_failure=0" - "--gtest_catch_exceptions=0" - ) diff --git a/cmake/vendor.cmake b/cmake/vendor.cmake deleted file mode 100644 index 0b164434c9..0000000000 --- a/cmake/vendor.cmake +++ /dev/null @@ -1,37 +0,0 @@ -execute_process( - COMMAND git submodule update --init . - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/vendor -) - -include(${CMAKE_SOURCE_DIR}/vendor/benchmark.cmake) -include(${CMAKE_SOURCE_DIR}/vendor/boost.cmake) -include(${CMAKE_SOURCE_DIR}/vendor/cheap-ruler-cpp.cmake) -include(${CMAKE_SOURCE_DIR}/vendor/earcut.hpp.cmake) -include(${CMAKE_SOURCE_DIR}/vendor/eternal.cmake) -include(${CMAKE_SOURCE_DIR}/vendor/expected.cmake) -include(${CMAKE_SOURCE_DIR}/vendor/filesystem.cmake) -include(${CMAKE_SOURCE_DIR}/vendor/geojson-vt-cpp.cmake) -include(${CMAKE_SOURCE_DIR}/vendor/geojson.hpp.cmake) -include(${CMAKE_SOURCE_DIR}/vendor/googletest.cmake) -include(${CMAKE_SOURCE_DIR}/vendor/icu.cmake) -include(${CMAKE_SOURCE_DIR}/vendor/jni.hpp.cmake) -include(${CMAKE_SOURCE_DIR}/vendor/kdbush.hpp.cmake) -include(${CMAKE_SOURCE_DIR}/vendor/nunicode.cmake) -include(${CMAKE_SOURCE_DIR}/vendor/pixelmatch-cpp.cmake) -include(${CMAKE_SOURCE_DIR}/vendor/polylabel.cmake) -include(${CMAKE_SOURCE_DIR}/vendor/protozero.cmake) -include(${CMAKE_SOURCE_DIR}/vendor/rapidjson.cmake) -include(${CMAKE_SOURCE_DIR}/vendor/shelf-pack-cpp.cmake) -include(${CMAKE_SOURCE_DIR}/vendor/supercluster.hpp.cmake) -include(${CMAKE_SOURCE_DIR}/vendor/unique_resource.cmake) -include(${CMAKE_SOURCE_DIR}/vendor/vector-tile.cmake) -include(${CMAKE_SOURCE_DIR}/vendor/wagyu.cmake) -include(${CMAKE_SOURCE_DIR}/vendor/args.cmake) - -if(NOT TARGET mapbox-base) - add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/vendor/mapbox-base ${CMAKE_BINARY_DIR}/.build-mapbox-gl-native-mapbox-base) -endif() - -if(MBGL_PLATFORM STREQUAL "linux" OR MBGL_PLATFORM STREQUAL "macos") - include(${CMAKE_SOURCE_DIR}/vendor/glfw.cmake) -endif() diff --git a/cmake/xcode.cmake b/cmake/xcode.cmake deleted file mode 100644 index 3537009330..0000000000 --- a/cmake/xcode.cmake +++ /dev/null @@ -1,75 +0,0 @@ -function(get_target_filename OUTPUT TARGET) - get_target_property(_TYPE "${TARGET}" TYPE) - get_target_property(_PREFIX "${TARGET}" PREFIX) - if(NOT _PREFIX AND NOT _PREFIX STREQUAL "") - set(_PREFIX "${CMAKE_${_TYPE}_PREFIX}") - endif() - get_target_property(_BASENAME "${TARGET}" OUTPUT_NAME) - if(NOT _BASENAME) - get_target_property(_BASENAME "${TARGET}" NAME) - endif() - get_target_property(_SUFFIX "${TARGET}" SUFFIX) - if(NOT _SUFFIX AND NOT _SUFFIX STREQUAL "") - set(_SUFFIX "${CMAKE_${_TYPE}_SUFFIX}") - endif() - set(${OUTPUT} "${_PREFIX}${_BASENAME}${_SUFFIX}" PARENT_SCOPE) -endfunction() - -function(xcode_create_scheme) - if (NOT CMAKE_GENERATOR STREQUAL "Xcode") - return() - endif() - - cmake_parse_arguments(XCSCHEME "" "TARGET;TYPE;NAME" "ARGS;OPTIONAL_ARGS" ${ARGN}) - - if(XCSCHEME_UNPARSED_ARGUMENTS) - message(FATAL_ERROR "xcode_create_scheme() called with unrecognized arguments: ${XCSCHEME_UNPARSED_ARGUMENTS}") - endif() - - if(NOT XCSCHEME_TARGET) - message(FATAL_ERROR "xcode_create_scheme() called without required argument TARGET") - endif() - - if(NOT XCSCHEME_TYPE) - get_target_property(_TYPE "${XCSCHEME_TARGET}" TYPE) - if (_TYPE MATCHES "^.*_LIBRARY$") - set(XCSCHEME_TYPE "library") - elseif(_TYPE STREQUAL "EXECUTABLE") - set(XCSCHEME_TYPE "executable") - else() - message(FATAL_ERROR "xcode_create_scheme() could not determine type of ${XCSCHEME_TARGET}") - endif() - endif() - - if(NOT XCSCHEME_NAME) - set(XCSCHEME_NAME "${XCSCHEME_TARGET}") - endif() - - set(XCODEPROJ_PATH "${PROJECT_BINARY_DIR}/${PROJECT_NAME}.xcodeproj") - set(XCSCHEME_OUTPUT_FILE "${XCODEPROJ_PATH}/xcshareddata/xcschemes/${XCSCHEME_NAME}.xcscheme") - - # Prevent overwriting of the scheme file on every CMake rerun. - if (EXISTS "${XCSCHEME_OUTPUT_FILE}") - return() - endif() - - file(RELATIVE_PATH XCSCHEME_CONTAINER "${CMAKE_SOURCE_DIR}" "${XCODEPROJ_PATH}") - string(RANDOM LENGTH 24 ALPHABET "0123456789ABCDEF" XCSCHEME_BLUEPRINT_ID) - get_target_filename(XCSCHEME_BUILDABLE_NAME "${XCSCHEME_TARGET}") - set(XCSCHEME_BLUEPRINT_NAME "${XCSCHEME_TARGET}") - set(XCSCHEME_WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}") - set(XCSCHEME_NODE_EXECUTABLE "${NodeJS_EXECUTABLE}") - get_filename_component(XCSCHEME_NODE_PATH "${NodeJS_EXECUTABLE}" DIRECTORY) - - set(XCSCHEME_COMMAND_LINE_ARGS "") - foreach(_ARG IN LISTS XCSCHEME_ARGS) - set(XCSCHEME_COMMAND_LINE_ARGS "${XCSCHEME_COMMAND_LINE_ARGS}\n <CommandLineArgument\n argument = \"${_ARG}\"\n isEnabled = \"YES\">\n </CommandLineArgument>") - endforeach() - foreach(_ARG IN LISTS XCSCHEME_OPTIONAL_ARGS) - set(XCSCHEME_COMMAND_LINE_ARGS "${XCSCHEME_COMMAND_LINE_ARGS}\n <CommandLineArgument\n argument = \"${_ARG}\"\n isEnabled = \"NO\">\n </CommandLineArgument>") - endforeach() - - configure_file( - "${CMAKE_SOURCE_DIR}/cmake/${XCSCHEME_TYPE}.xcscheme" - "${XCSCHEME_OUTPUT_FILE}") -endfunction() diff --git a/platform/android/src/test/version-script b/platform/android/src/test/version-script deleted file mode 100644 index ebc2c17018..0000000000 --- a/platform/android/src/test/version-script +++ /dev/null @@ -1,8 +0,0 @@ -{ -global: - EnsureFrontOfChain; - AddSpecialSignalHandlerFn; - RemoveSpecialSignalHandlerFn; -local: - *; -}; diff --git a/platform/android/version-script b/platform/android/version-script deleted file mode 100644 index 7c1e3d54a2..0000000000 --- a/platform/android/version-script +++ /dev/null @@ -1,4 +0,0 @@ -{ - global: JNI_OnLoad; - local: *; -};
\ No newline at end of file diff --git a/platform/linux/config.cmake b/platform/linux/config.cmake deleted file mode 100644 index aa65ddb606..0000000000 --- a/platform/linux/config.cmake +++ /dev/null @@ -1,203 +0,0 @@ -include(cmake/sqlite.cmake) - -add_library(mbgl-loop-uv STATIC - platform/default/src/mbgl/util/async_task.cpp - platform/default/src/mbgl/util/run_loop.cpp - platform/default/src/mbgl/util/timer.cpp -) - -target_include_directories(mbgl-loop-uv - PRIVATE include - PRIVATE src -) - -target_link_libraries(mbgl-loop-uv - PRIVATE mbgl-core -) - -target_add_mason_package(mbgl-loop-uv PUBLIC libuv) - -macro(mbgl_platform_core) - if(WITH_OSMESA) - target_sources(mbgl-core - PRIVATE platform/default/src/mbgl/gl/headless_backend_osmesa.cpp - ) - target_link_libraries(mbgl-core - PUBLIC -lOSMesa - ) - elseif(WITH_EGL) - target_sources(mbgl-core - PRIVATE platform/linux/src/headless_backend_egl.cpp - ) - target_add_mason_package(mbgl-core PUBLIC swiftshader) - else() - target_sources(mbgl-core - PRIVATE platform/linux/src/headless_backend_glx.cpp - ) - target_link_libraries(mbgl-core - PUBLIC -lGL - PUBLIC -lX11 - ) - endif() - - target_sources(mbgl-core - # GL - PRIVATE platform/linux/src/gl_functions.cpp - - # Misc - PRIVATE platform/default/src/mbgl/util/logging_stderr.cpp - PRIVATE platform/default/src/mbgl/util/string_stdlib.cpp - PRIVATE platform/default/src/mbgl/util/thread.cpp - PRIVATE platform/default/src/mbgl/text/bidi.cpp - PRIVATE platform/default/src/mbgl/text/collator.cpp - PRIVATE platform/default/src/mbgl/layermanager/layer_manager.cpp - PRIVATE platform/default/src/mbgl/text/local_glyph_rasterizer.cpp - PRIVATE platform/default/src/mbgl/util/thread_local.cpp - PRIVATE platform/default/src/mbgl/text/unaccent.cpp - PRIVATE platform/default/include/mbgl/text/unaccent.hpp - PRIVATE platform/default/src/mbgl/util/utf.cpp - PRIVATE platform/default/src/mbgl/util/format_number.cpp - - # Image handling - PRIVATE platform/default/src/mbgl/util/image.cpp - PRIVATE platform/default/src/mbgl/util/jpeg_reader.cpp - PRIVATE platform/default/src/mbgl/util/png_writer.cpp - PRIVATE platform/default/src/mbgl/util/png_reader.cpp - - # Headless view - PRIVATE platform/default/src/mbgl/gfx/headless_frontend.cpp - PRIVATE platform/default/include/mbgl/gfx/headless_frontend.hpp - PRIVATE platform/default/src/mbgl/gfx/headless_backend.cpp - PRIVATE platform/default/include/mbgl/gfx/headless_backend.hpp - PRIVATE platform/default/src/mbgl/gl/headless_backend.cpp - PRIVATE platform/default/include/mbgl/gl/headless_backend.hpp - - # Snapshotting - PRIVATE platform/default/src/mbgl/map/map_snapshotter.cpp - PRIVATE platform/default/include/mbgl/map/map_snapshotter.hpp - ) - - target_include_directories(mbgl-core - PRIVATE platform/default/include - PRIVATE platform/linux - ) - - target_add_mason_package(mbgl-core PUBLIC libpng) - target_add_mason_package(mbgl-core PUBLIC libjpeg-turbo) - target_add_mason_package(mbgl-core PRIVATE icu) - - # Ignore warning caused by ICU header unistr.h in some CI environments - set_source_files_properties(platform/default/src/mbgl/util/format_number.cpp PROPERTIES COMPILE_FLAGS -Wno-error=shadow) - - # Link all ICU libraries (by default only libicuuc is linked) - find_library(LIBICUI18N NAMES icui18n HINTS ${MASON_PACKAGE_icu_INCLUDE_DIRS}/../lib) - find_library(LIBICUUC NAMES icuuc HINTS ${MASON_PACKAGE_icu_INCLUDE_DIRS}/../lib) - find_library(LIBICUDATA NAMES icudata HINTS ${MASON_PACKAGE_icu_INCLUDE_DIRS}/../lib) - - target_link_libraries(mbgl-core - PRIVATE ${LIBICUI18N} - PRIVATE ${LIBICUUC} - PRIVATE ${LIBICUDATA} - PRIVATE nunicode - PUBLIC -lz - ) - - if(WITH_CXX11ABI) - # Statically link libstdc++ when we're using the new STL ABI - target_link_libraries(mbgl-core - PUBLIC -static-libstdc++ - PUBLIC -Wl,-Bsymbolic-functions - ) - endif() -endmacro() - - -macro(mbgl_filesource) - # Modify platform/linux/filesource-files.json to change the source files for this target. - target_sources_from_file(mbgl-filesource PRIVATE platform/linux/filesource-files.json) - - # We're not referencing any cURL symbols since we're dynamically loading it. However, we want to - # link the library anyway since we're definitely going to load it on startup anyway. - target_link_libraries(mbgl-filesource - PUBLIC sqlite - PUBLIC -Wl,--no-as-needed -lcurl -Wl,--as-needed - ) -endmacro() - - -macro(mbgl_platform_glfw) - target_link_libraries(mbgl-glfw - PRIVATE mbgl-filesource - PRIVATE mbgl-loop-uv - ) - - add_custom_command( - TARGET mbgl-glfw POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy - ${CMAKE_SOURCE_DIR}/misc/ca-bundle.crt - ${CMAKE_CURRENT_BINARY_DIR}/ca-bundle.crt - ) -endmacro() - - -macro(mbgl_platform_render) - target_link_libraries(mbgl-render - PRIVATE mbgl-filesource - PRIVATE mbgl-loop-uv - ) -endmacro() - - -macro(mbgl_platform_offline) - target_link_libraries(mbgl-offline - PRIVATE mbgl-filesource - PRIVATE mbgl-loop-uv - ) -endmacro() - - -macro(mbgl_platform_test) - target_sources(mbgl-test - PRIVATE platform/default/src/mbgl/test/main.cpp - ) - - target_include_directories(mbgl-test - PRIVATE platform/linux - ) - - set_source_files_properties( - platform/default/src/mbgl/test/main.cpp - PROPERTIES - COMPILE_FLAGS -DWORK_DIRECTORY="${CMAKE_SOURCE_DIR}" - ) - - target_link_libraries(mbgl-test - PRIVATE mbgl-filesource - PRIVATE mbgl-loop-uv - ) -endmacro() - - -macro(mbgl_platform_benchmark) - target_sources(mbgl-benchmark - PRIVATE platform/default/src/mbgl/benchmark/main.cpp - ) - - set_source_files_properties( - platform/default/src/mbgl/benchmark/main.cpp - PROPERTIES - COMPILE_FLAGS -DWORK_DIRECTORY="${CMAKE_SOURCE_DIR}" - ) - - target_link_libraries(mbgl-benchmark - PRIVATE mbgl-filesource - PRIVATE mbgl-loop-uv - ) -endmacro() - - -macro(mbgl_platform_node) - target_link_libraries(mbgl-node INTERFACE - -Wl,--version-script=${CMAKE_SOURCE_DIR}/platform/node/version-script - ) -endmacro() diff --git a/platform/node/version-script b/platform/node/version-script deleted file mode 100644 index ab02f05633..0000000000 --- a/platform/node/version-script +++ /dev/null @@ -1,3 +0,0 @@ -{ - local: *; -}; diff --git a/platform/qt/config.cmake b/platform/qt/config.cmake deleted file mode 100644 index 9249f846e8..0000000000 --- a/platform/qt/config.cmake +++ /dev/null @@ -1,75 +0,0 @@ -include(platform/qt/qt.cmake) - -macro(mbgl_platform_core) - target_sources(mbgl-core - ${MBGL_QT_CORE_FILES} - ) - - target_include_directories(mbgl-core - PRIVATE platform/qt - PRIVATE platform/qt/include - PUBLIC platform/default/include - ) - - target_link_libraries(mbgl-core PRIVATE - ${MBGL_QT_CORE_LIBRARIES} - nunicode - ) - - if(NOT WITH_QT_DECODERS) - target_sources(mbgl-core - PRIVATE platform/default/src/mbgl/util/jpeg_reader.cpp - PRIVATE platform/default/src/mbgl/util/png_reader.cpp - ) - - target_add_mason_package(mbgl-core PRIVATE libjpeg-turbo) - target_add_mason_package(mbgl-core PRIVATE libpng) - else() - add_definitions(-DQT_IMAGE_DECODERS) - endif() - - if(NOT WITH_QT_I18N) - target_sources(mbgl-core PRIVATE platform/default/src/mbgl/text/bidi.cpp) - target_link_libraries(mbgl-core PRIVATE icu) - else() - target_sources(mbgl-core PRIVATE platform/qt/src/bidi.cpp) - endif() -endmacro() - - -macro(mbgl_filesource) - target_sources(mbgl-filesource - ${MBGL_QT_FILESOURCE_FILES} - ) - - target_link_libraries(mbgl-filesource - ${MBGL_QT_FILESOURCE_LIBRARIES} - ) -endmacro() - -# FIXME: For now tests are disabled on Windows until we -# get the node.js dependencies working. -if (NOT CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows") - macro(mbgl_platform_test) - target_sources(mbgl-test - PRIVATE platform/qt/test/main.cpp - PRIVATE platform/qt/test/qmapboxgl.test.cpp - PRIVATE platform/qt/test/qmapboxgl.test.cpp - ) - - target_include_directories(mbgl-test - PRIVATE platform/qt - ) - - set_source_files_properties( - platform/qt/test/main.cpp - PROPERTIES COMPILE_FLAGS -DWORK_DIRECTORY="${CMAKE_SOURCE_DIR}" - ) - - target_link_libraries(mbgl-test - PRIVATE qmapboxgl - PRIVATE mbgl-filesource - PRIVATE -pthread - ) - endmacro() -endif() diff --git a/scripts/check-cxx11abi.dat b/scripts/check-cxx11abi.dat Binary files differdeleted file mode 100755 index eab7298b50..0000000000 --- a/scripts/check-cxx11abi.dat +++ /dev/null diff --git a/scripts/check-cxx11abi.sh b/scripts/check-cxx11abi.sh deleted file mode 100755 index c6fd9258c5..0000000000 --- a/scripts/check-cxx11abi.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -set -e -set -o pipefail - -if ! [ `uname -s` = 'Linux' ] || \ - ! command -v readelf > /dev/null || \ - ! command -v c++filt > /dev/null; then - echo -n "OFF" - exit 0 -fi - -# check-cxx11abi.dat is a binary just so we can use the loader -# to take care of finding the libstdc++ which can be tricky. -LIBSTDCPP=$(ldd $(dirname $0)/check-cxx11abi.dat |grep libstdc++ |cut -d' ' -f3) - -if [ $(readelf -Ws $LIBSTDCPP |c++filt |grep -c ::__cxx11::) -gt 0 ]; then - echo -n "ON" -else - echo -n "OFF" -fi |