diff --git a/.dd4hep-ci.d/compile_and_test.sh b/.dd4hep-ci.d/compile_and_test.sh index acceb63f0bc43d839fa9e30c2f148337d8e291ca..53dd616283d8c5e0edb7c1cebb1906dd7192027f 100755 --- a/.dd4hep-ci.d/compile_and_test.sh +++ b/.dd4hep-ci.d/compile_and_test.sh @@ -13,7 +13,7 @@ cmake -GNinja -DDD4HEP_USE_GEANT4=ON \ -DDD4HEP_DEBUG_CMAKE=ON \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_CXX_FLAGS="-fdiagnostics-color=always -Werror" \ - -DCMAKE_CXX_STANDARD=${STANDARD} .. && \ + -DCMAKE_CXX_STANDARD=${STANDARD} ${CMAKE_ARGS} .. && \ ninja && \ ninja install && \ . ../bin/thisdd4hep.sh && \ diff --git a/.travis.yml b/.travis.yml index 4389df0b3b6ebd50da8f6a77d9e902c127de9c68..ef9a75c55ea05777cd6cf9023ae5749031f37a06 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,7 @@ language: cpp env: - COMPILER=gcc; LCG_RELEASE=LCG_96b; STANDARD=17; COMPILER_VERSION=gcc8; PYTHON_CHECK="no" + - COMPILER=gcc; LCG_RELEASE=LCG_96b; STANDARD=17; COMPILER_VERSION=gcc8; PYTHON_CHECK="no"; CMAKE_ARGS="-DBUILD_SHARED_LIBS=OFF" - COMPILER=gcc; LCG_RELEASE=LCG_96python3; STANDARD=17; COMPILER_VERSION=gcc8; PYTHON_CHECK="no" - COMPILER=clang; LCG_RELEASE=LCG_96b; STANDARD=17; COMPILER_VERSION=clang8; PYTHON_CHECK="no" - COMPILER=gcc; LCG_RELEASE=LCG_96b; STANDARD=14; COMPILER_VERSION=gcc62; PYTHON_CHECK="no" @@ -58,7 +59,7 @@ install: # command to run tests script: - - docker run -ti --name CI_container -v $PKGDIR:/DD4hep -e COMPILER_TYPE=$COMPILER -e LCG_RELEASE=${LCG_RELEASE} -e STANDARD=${STANDARD} -e COMPILER_VERSION=${COMPILER_VERSION} ${CVMFS_REPOS} -d clicdp/cc7-lcg /bin/bash + - docker run -ti --name CI_container -v $PKGDIR:/DD4hep -e COMPILER_TYPE=$COMPILER -e LCG_RELEASE=${LCG_RELEASE} -e STANDARD=${STANDARD} -e COMPILER_VERSION=${COMPILER_VERSION} -e CMAKE_ARGS=${CMAKE_ARGS} ${CVMFS_REPOS} -d clicdp/cc7-lcg /bin/bash - if [[ "$PYTHON_CHECK" == "yes" ]]; then docker exec -ti CI_container /bin/bash -c "./DD4hep/.dd4hep-ci.d/runPythonChecks.sh"; else docker exec -ti CI_container /bin/bash -c "./DD4hep/.dd4hep-ci.d/compile_and_test.sh";