detect travis using environmental vars

pull/1269/head
Jeff Becker 4 years ago
parent e56faba23d
commit 1072d9b505
No known key found for this signature in database
GPG Key ID: F357B3B42F6F9B05

@ -43,7 +43,10 @@ option(TRACY_ROOT "include tracy profiler source" OFF)
option(WITH_TESTS "build unit tests" ON)
option(WITH_HIVE "build simulation stubs" OFF)
option(BUILD_PACKAGE "builds extra components for making an installer (with 'make package')" OFF)
option(TRAVIS_CI_SUCKS "are we building inside travis-ci?" OFF)
if($ENV{TRAVIS})
set(TRAVIS_CI_SUCKS ON)
endif()
if(WITH_HIVE)
set(WITH_SHARED ON)

@ -112,8 +112,6 @@ XSAN ?= False
HIVE ?= OFF
# compile unittests
TESTS ?= ON
# building in ci?
TRAVIS_SUCKS ?= OFF
# cmake generator type
CMAKE_GEN ?= Unix Makefiles
@ -130,7 +128,7 @@ SCAN_BUILD ?= scan-build
UNAME = $(shell which uname)
COMMON_CMAKE_OPTIONS = -DSTATIC_LINK_RUNTIME=$(STATIC_LINK) -DUSE_NETNS=$(NETNS) -DUSE_AVX2=$(AVX2) -DWITH_SHARED=$(SHARED_LIB) -DDOWNLOAD_SODIUM=$(DOWNLOAD_SODIUM) -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DXSAN=$(XSAN) -DWITH_HIVE=$(HIVE) -DWITH_TESTS=$(TESTS) -DTRAVIS_CI_SUCKS=$(TRAVIS_SUCKS)
COMMON_CMAKE_OPTIONS = -DSTATIC_LINK_RUNTIME=$(STATIC_LINK) -DUSE_NETNS=$(NETNS) -DUSE_AVX2=$(AVX2) -DWITH_SHARED=$(SHARED_LIB) -DDOWNLOAD_SODIUM=$(DOWNLOAD_SODIUM) -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DXSAN=$(XSAN) -DWITH_HIVE=$(HIVE) -DWITH_TESTS=$(TESTS)
ifeq ($(shell $(UNAME)),SunOS)
CONFIG_CMD = $(shell gecho -n "cd '$(BUILD_ROOT)' && " ; gecho -n "cmake -G'$(CMAKE_GEN)' -DCMAKE_CROSSCOMPILING=$(CROSS) -DUSE_SHELLHOOKS=$(SHELL_HOOKS) $(COMMON_CMAKE_OPTIONS) '$(REPO)'")

Loading…
Cancel
Save