diff options
| author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-07-19 18:58:37 +0300 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2016-08-05 11:42:22 +0200 |
| commit | 0fb3b6e333901df313d404ab7507cbb4fa6baf09 (patch) | |
| tree | 8ce6fae9f6dd19d295036adf03c0a3d4eed3c090 /Makefile | |
| parent | 023ff83d881fb810f4428594ca476bb436b303f6 (diff) | |
| download | qtlocation-mapboxgl-0fb3b6e333901df313d404ab7507cbb4fa6baf09.tar.gz | |
[build] Re-enable coverage run
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 10 |
1 files changed, 4 insertions, 6 deletions
@@ -258,7 +258,8 @@ $(LINUX_BUILD): $(BUILD_DEPS) (cd $(LINUX_OUTPUT_PATH) && cmake -G Ninja ../../.. \ -DCMAKE_BUILD_TYPE=$(BUILDTYPE) \ -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \ - -DWITH_CXX11ABI=$(shell scripts/check-cxx11abi.sh)) + -DWITH_CXX11ABI=$(shell scripts/check-cxx11abi.sh) \ + -DWITH_COVERAGE=${WITH_COVERAGE}) .PHONY: linux linux: glfw-app render offline @@ -296,10 +297,6 @@ endif run-test-%: test $(GDB) $(LINUX_OUTPUT_PATH)/mbgl-test --gtest_catch_exceptions=0 --gtest_filter=$* -.PHONY: coverage -coverage: test - scripts/collect-coverage.sh $(LINUX_OUTPUT_PATH) - .PHONY: compdb compdb: $(LINUX_BUILD) # Ninja generator already outputs the file at the right location @@ -334,7 +331,8 @@ $(QT_BUILD): $(BUILD_DEPS) -DMBGL_PLATFORM=qt \ -DWITH_QT_DECODERS=${WITH_QT_DECODERS} \ -DWITH_QT_4=${WITH_QT_4} \ - -DWITH_CXX11ABI=$(shell scripts/check-cxx11abi.sh)) + -DWITH_CXX11ABI=$(shell scripts/check-cxx11abi.sh) \ + -DWITH_COVERAGE=${WITH_COVERAGE}) .PHONY: qt-app qt-app: $(QT_BUILD) |