Skip to content
Snippets Groups Projects
Commit 84396d87 authored by Frank Bossen's avatar Frank Bossen
Browse files

Merge branch 'trace-build' into 'master'

Jenkins CI: option for selective trace file build

See merge request !241
parents 95eb4679 98a894f0
No related branches found
No related tags found
No related merge requests found
...@@ -43,6 +43,8 @@ else ...@@ -43,6 +43,8 @@ else
UNAME_S := $(shell uname -s) UNAME_S := $(shell uname -s)
BUILD_CMD := $(BUILD_SCRIPT) BUILD_CMD := $(BUILD_SCRIPT)
ifeq ($(UNAME_S),Linux) ifeq ($(UNAME_S),Linux)
# for Jenkins: run trace build only on Linux
TRACEBUILD := TRUE
endif endif
ifeq ($(UNAME_S),Darwin) ifeq ($(UNAME_S),Darwin)
# MAC # MAC
...@@ -96,6 +98,14 @@ ifneq ($(static),) ...@@ -96,6 +98,14 @@ ifneq ($(static),)
CONFIG_OPTIONS += -DBUILD_STATIC=$(static) CONFIG_OPTIONS += -DBUILD_STATIC=$(static)
endif endif
# don't build, if TRACEBUILD option is not set (for selective Jenkins build)
ifeq ($(TRACEBUILD),TRUE)
CONFIG_OPTIONS += -DSET_ENABLE_TRACING=ON -DENABLE_TRACING=1
TRACE_BUILD_CMD = $(BUILD_CMD)
else
TRACE_BUILD_CMD = echo TRACE BUILD DISABLED
endif
BUILD_OPTIONS := $(CONFIG_OPTIONS) -b BUILD_OPTIONS := $(CONFIG_OPTIONS) -b
debug: debug:
...@@ -127,6 +137,10 @@ clean-p: ...@@ -127,6 +137,10 @@ clean-p:
configure: configure:
$(BUILD_CMD) $(CONFIG_OPTIONS) $(CMAKE_OPTIONS) variant=debug,release,relwithdebinfo $(BUILD_CMD) $(CONFIG_OPTIONS) $(CMAKE_OPTIONS) variant=debug,release,relwithdebinfo
tracebuild:
# option for automated jenkins build
$(TRACE_BUILD_CMD) $(BUILD_JOBS) $(BUILD_OPTIONS) $(CMAKE_OPTIONS) variant=debug
# #
# project specific targets # project specific targets
# #
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment