From 897b595db856883a6ce77c6c893ddb7b92f69d7c Mon Sep 17 00:00:00 2001 From: Joseph Lenox Date: Sat, 5 May 2018 00:17:32 -0500 Subject: [PATCH] Set compile configuration variables if they are in the environment for the path to slic3r var dir --- .travis.yml | 1 + src/CMakeLists.txt | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 34940401f..c5d7c00a1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,7 @@ install: - export SLIC3R_STATIC=1 - export CXX=g++-7 - export CC=gcc-7 +- export SLIC3R_VAR_REL=./var script: - bash package/linux/travis-setup.sh - cmake -DBOOST_ROOT=$BOOST_DIR src/ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 86753350d..0a8b9f9b0 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -3,7 +3,20 @@ project (slic3r) # only on newer GCCs: -ftemplate-backtrace-limit=0 -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -DM_PI=3.14159265358979323846 -D_GLIBCXX_USE_C99 -DHAS_BOOL -DNOGDI -DBOOST_ASIO_DISABLE_KQUEUE") +set(CMAKE_CXX_FLAGS "-g ${CMAKE_CXX_FLAGS} -Wall -DM_PI=3.14159265358979323846 -D_GLIBCXX_USE_C99 -DHAS_BOOL -DNOGDI -DBOOST_ASIO_DISABLE_KQUEUE") + +if(DEFINED ENV{SLIC3R_VAR_REL}) + set(CMAKE_CXX_FLAGS "-DVAR_REL=$ENV{SLIC3R_VAR_REL}") +endif(DEFINED ENV{SLIC3R_VAR_REL}) + +if(DEFINED ENV{SLIC3R_VAR_ABS}) + set(CMAKE_CXX_FLAGS "-DVAR_ABS") +endif(DEFINED ENV{SLIC3R_VAR_ABS}) + +if(DEFINED ENV{SLIC3R_VAR_ABS_PATH}) + set(CMAKE_CXX_FLAGS "-DVAR_ABS_PATH=$ENV{SLIC3R_VAR_ABS_PATH}") +endif(DEFINED ENV{SLIC3R_VAR_ABS_PATH}) + execute_process(COMMAND git rev-parse --short HEAD OUTPUT_VARIABLE GIT_VERSION ERROR_QUIET)