diff options
| author | Julian Rex <julian.rex@gmail.com> | 2019-04-02 16:44:02 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-02 16:44:02 -0400 |
| commit | bf21fa1ff8412089606c6c3aa4cc0dbebfe91b2d (patch) | |
| tree | f6fa6394c67f4e177145d2b9bf997bff18f245e9 /Makefile | |
| parent | 2455275bf47e1671a92eb2c1296c6b48f11f6b2e (diff) | |
| download | qtlocation-mapboxgl-bf21fa1ff8412089606c6c3aa4cc0dbebfe91b2d.tar.gz | |
[core] Adds target branch parameter to clang-tools.sh (#14301)
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -1,6 +1,8 @@ export BUILDTYPE ?= Debug export IS_LOCAL_DEVELOPMENT ?= true export WITH_CXX11ABI ?= $(shell scripts/check-cxx11abi.sh) +export TARGET_BRANCH ?= master + ifeq ($(BUILDTYPE), Release) else ifeq ($(BUILDTYPE), RelWithDebInfo) @@ -191,12 +193,11 @@ compdb: $(BUILD_DEPS) $(TEST_DEPS) $(MACOS_COMPDB_PATH)/Makefile .PHONY: tidy tidy: compdb - scripts/clang-tools.sh $(MACOS_COMPDB_PATH) + scripts/clang-tools.sh $(MACOS_COMPDB_PATH) $(TARGET_BRANCH) .PHONY: check check: compdb - scripts/clang-tools.sh $(MACOS_COMPDB_PATH) --diff - + scripts/clang-tools.sh $(MACOS_COMPDB_PATH) $(TARGET_BRANCH) --diff endif #### iOS targets ############################################################## @@ -383,11 +384,11 @@ compdb: $(LINUX_BUILD) .PHONY: tidy tidy: compdb - scripts/clang-tools.sh $(LINUX_OUTPUT_PATH) + scripts/clang-tools.sh $(LINUX_OUTPUT_PATH) $(TARGET_BRANCH) .PHONY: check check: compdb - scripts/clang-tools.sh $(LINUX_OUTPUT_PATH) --diff + scripts/clang-tools.sh $(LINUX_OUTPUT_PATH) $(TARGET_BRANCH) --diff endif |