diff --git a/.dd4hep-ci.d/compile_and_test.sh b/.dd4hep-ci.d/compile_and_test.sh index 53dd616283d8c5e0edb7c1cebb1906dd7192027f..bdc4b5f7f15b3b6eb07881e63ecfde8fc5c7d997 100755 --- a/.dd4hep-ci.d/compile_and_test.sh +++ b/.dd4hep-ci.d/compile_and_test.sh @@ -13,8 +13,15 @@ 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} ${CMAKE_ARGS} .. && \ -ninja && \ + -DBUILD_SHARED_LIBS=${SHARED} \ + -DCMAKE_CXX_STANDARD=${STANDARD} .. && \ + ninja + +if [[ "${SHARED}" == "OFF" ]]; +then + exit 0; +fi + ninja install && \ . ../bin/thisdd4hep.sh && \ ctest --output-on-failure -j4 && \ diff --git a/.travis.yml b/.travis.yml index 30c49d7963fff6ac92bfbd0ef032e7970bb3bee3..57ccebb274b04198b8c5cceeb2018c6ef125a649 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ language: cpp env: - COMPILER=gcc; LCG_RELEASE=LCG_96b; STANDARD=17; COMPILER_VERSION=gcc9; 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_96b; STANDARD=17; COMPILER_VERSION=gcc8; PYTHON_CHECK="no"; SHARED=OFF - COMPILER=gcc; LCG_RELEASE=LCG_96bpython3; 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" @@ -59,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} -e CMAKE_ARGS=${CMAKE_ARGS} ${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 SHARED=${SHARED:-ON} ${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";