diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ec308047e74c7bb83f4d26fa04171fc018706dd2..e0d36432915f11728df6e63a7c2cc392fb837aec 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -79,12 +79,15 @@ stages: image: ${DEPENDENCIES_IMAGE} stage: build script: - - echo 'CMAKE_FLAGS+=" -DCMAKE_INSTALL_PREFIX=$PWD/dune-copasi-install"' >> /duneci/cmake-flags/dune-copasi + - echo 'CMAKE_FLAGS+=" -DCMAKE_INSTALL_PREFIX=$CI_PROJECT_DIR/dune-copasi-install"' >> /duneci/cmake-flags/dune-copasi + - echo 'CMAKE_FLAGS+=" -DCMAKE_CXX_FLAGS_RELEASE=-O3"' >> /duneci/cmake-flags/dune-copasi + - echo 'CMAKE_FLAGS+=" -DDUNE_COPASI_SD_EXECUTABLE=ON"' >> /duneci/cmake-flags/dune-copasi + - echo 'CMAKE_FLAGS+=" -DDUNE_COPASI_MD_EXECUTABLE=ON"' >> /duneci/cmake-flags/dune-copasi - cd .. - bash dune-copasi/.ci/build.sh artifacts: paths: - - dune-copasi-install + - $CI_PROJECT_DIR/dune-copasi-install expire_in: 30 mins <<: *default_tags @@ -93,7 +96,7 @@ stages: stage: unit_tests script: - echo 'CMAKE_FLAGS+=" -DCMAKE_BUILD_TYPE=Debug"' >> /duneci/cmake-flags/dune-copasi - - echo 'CMAKE_FLAGS+=" -DCMAKE_PREFIX_PATH=$PWD/dune-copasi-install"' >> /duneci/cmake-flags/dune-copasi + - echo 'CMAKE_FLAGS+=" -DCMAKE_PREFIX_PATH=$CI_PROJECT_DIR/dune-copasi-install"' >> /duneci/cmake-flags/dune-copasi - cd .. - bash dune-copasi/.ci/unit_tests.sh artifacts: @@ -107,7 +110,7 @@ stages: image: ${DEPENDENCIES_IMAGE} stage: system_tests script: - - echo 'CMAKE_FLAGS+=" -DCMAKE_PREFIX_PATH=$PWD/dune-copasi-install"' >> /duneci/cmake-flags/dune-copasi + - echo 'CMAKE_FLAGS+=" -DCMAKE_PREFIX_PATH=$CI_PROJECT_DIR/dune-copasi-install"' >> /duneci/cmake-flags/dune-copasi - cd .. - bash dune-copasi/.ci/system_tests.sh artifacts: diff --git a/cmake/modules/SetupDuneCopasiConfig.cmake b/cmake/modules/SetupDuneCopasiConfig.cmake index 2ab06b7585769a89e65d0cf9630e9d99e07cf49f..226dc8ca50a75f2427dcf47f8fb5f9499023ab0e 100644 --- a/cmake/modules/SetupDuneCopasiConfig.cmake +++ b/cmake/modules/SetupDuneCopasiConfig.cmake @@ -7,7 +7,7 @@ set(DUNE_CUSTOM_PKG_CONFIG_SECTION " include(CMakeFindDependencyMacro) find_dependency(dune-common REQUIRED) -list(APPEND CMAKE_MODULE_PATH \${dune-common_MODULE_PATH}) +list(APPEND CMAKE_MODULE_PATH \${dune-common_MODULE_PATH} \${dune-copasi_MODULE_PATH}) include(DuneMacros) include(CheckCXXFeatures)