Skip to content
Snippets Groups Projects
Commit 7385cc95 authored by Karsten Suehring's avatar Karsten Suehring
Browse files

fix build rules for Jenkins CI

change new build rule to be specific for Linux-build only
use usual parameters for enabling trace
parent 84396d87
No related branches found
No related tags found
No related merge requests found
...@@ -44,7 +44,7 @@ else ...@@ -44,7 +44,7 @@ else
BUILD_CMD := $(BUILD_SCRIPT) BUILD_CMD := $(BUILD_SCRIPT)
ifeq ($(UNAME_S),Linux) ifeq ($(UNAME_S),Linux)
# for Jenkins: run trace build only on Linux # for Jenkins: run trace build only on Linux
TRACEBUILD := TRUE LINUXBUILD := TRUE
endif endif
ifeq ($(UNAME_S),Darwin) ifeq ($(UNAME_S),Darwin)
# MAC # MAC
...@@ -98,14 +98,6 @@ ifneq ($(static),) ...@@ -98,14 +98,6 @@ 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:
...@@ -137,9 +129,11 @@ clean-p: ...@@ -137,9 +129,11 @@ 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: linuxbuild:
ifeq ($(LINUXBUILD),TRUE)
# option for automated jenkins build # option for automated jenkins build
$(TRACE_BUILD_CMD) $(BUILD_JOBS) $(BUILD_OPTIONS) $(CMAKE_OPTIONS) variant=debug $(BUILD_CMD) $(BUILD_JOBS) $(BUILD_OPTIONS) $(CMAKE_OPTIONS) variant=debug
endif
# #
# 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