Set all cmake falges in only one file

The dune base image usually read all the options files in the /duneci/cmake-flags/ folder, but exactly because it reads every file the flags are set depending on the order of the filers. The easiest solution is to set all flags into only one file. Then last flags will have precedence.

.ci/system_tests.sh

@@ -18,14 +18,14 @@ g++ --version
 gcc --version
 cmake --version
 
-if test "x$DUNE_OPTS_FILE" != "x"; then
-  CMAKE_FLAGS="$(. $DUNE_OPTS_FILE; eval echo \$CMAKE_FLAGS)"
+if test "x$DUNE_OPTIONS_FILE" != "x"; then
+  CMAKE_FLAGS="$(. $DUNE_OPTIONS_FILE; eval echo \$CMAKE_FLAGS)"
 fi
 
 mkdir dune-copasi/test/build-cmake && cd dune-copasi/test/build-cmake
 
-echo "cmake $CMAKE_FALGS --build .."
-eval cmake $CMAKE_FALGS --build ..
+echo "cmake $CMAKE_FLAGS .."
+eval cmake $CMAKE_FLAGS ..
 
 cmake --target build_system_tests
 ctest -j4 -L "DUNE_SYSTEMTEST" --output-on-failure

.ci/unit_tests.sh

@@ -18,14 +18,14 @@ g++ --version
 gcc --version
 cmake --version
 
-if test "x$DUNE_OPTS_FILE" != "x"; then
-  CMAKE_FLAGS="$(. $DUNE_OPTS_FILE; eval echo \$CMAKE_FLAGS)"
+if test "x$DUNE_OPTIONS_FILE" != "x"; then
+  CMAKE_FLAGS="$(. $DUNE_OPTIONS_FILE; eval echo \$CMAKE_FLAGS)"
 fi
 
 mkdir dune-copasi/test/build-cmake && cd dune-copasi/test/build-cmake
 
-echo "cmake $CMAKE_FALGS --build .."
-eval cmake $CMAKE_FALGS --build ..
+echo "cmake $CMAKE_FLAGS .."
+eval cmake $CMAKE_FLAGS ..
 
 cmake --target build_unit_tests
 ctest -j4 -L "unit" --output-on-failure

.gitlab-ci.yml

@@ -79,8 +79,8 @@ stages:
   image: ${DEPENDENCIES_IMAGE}
   stage: build
   script:
+    - echo 'CMAKE_FLAGS+=" -DCMAKE_INSTALL_PREFIX=$PWD/dune-copasi-install"' >> /duneci/cmake-flags/dune-copasi
     - cd ..
-    - echo 'CMAKE_FLAGS+=" -DCMAKE_INSTALL_PREFIX=dune-copasi-install"' >> /duneci/cmake-flags/dune_copasi
     - bash dune-copasi/.ci/build.sh
   artifacts:
     paths:
@@ -92,13 +92,13 @@ stages:
   image: ${DEPENDENCIES_IMAGE}
   stage: unit_tests
   script:
-    - echo 'CMAKE_FLAGS+=" -DCMAKE_PREFIX_PATH=dune-copasi-install"' >> /duneci/cmake-flags/dune_copasi
-    - echo 'CMAKE_FLAGS+=" -DCMAKE_BUILD_TYPE=Debug"' >> /duneci/cmake-flags/dune_copasi
+    - 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
     - cd ..
     - bash dune-copasi/.ci/unit_tests.sh
   artifacts:
     paths:
-      - build-cmake/test
+      - test/build-cmake
     expire_in: 1 day
     when: always
   <<: *default_tags
@@ -107,12 +107,13 @@ stages:
   image: ${DEPENDENCIES_IMAGE}
   stage: system_tests
   script:
+    - echo 'CMAKE_FLAGS+=" -DCMAKE_PREFIX_PATH=$PWD/dune-copasi-install"' >> /duneci/cmake-flags/dune-copasi
     - cd ..
     - bash dune-copasi/.ci/system_tests.sh
   artifacts:
     paths:
       - cd ..
-      - build-cmake/test
+      - test/build-cmake
     expire_in: 1 day
     when: always
   <<: *default_tags

Dockerfile

@@ -11,11 +11,11 @@ ENV PATH=/duneci/install/bin:$PATH
 
 RUN    ln -s /duneci/toolchains/${TOOLCHAIN} /duneci/toolchain \
     && export PATH=/duneci/install/bin:$PATH
-RUN    echo 'CMAKE_FLAGS+=" -DDUNE_PYTHON_VIRTUALENV_SETUP=1"' >> /duneci/cmake-flags/enable_virtualenv \
-    && echo 'CMAKE_FLAGS+=" -DDUNE_PYTHON_VIRTUALENV_PATH=/duneci/install/dune-python-venv"' >> /duneci/cmake-flags/enable_virtualenv \
-    && echo 'CMAKE_FLAGS+=" -DCMAKE_PREFIX_PATH:PATH=/duneci/install"' >> /duneci/cmake-flags/install_path \
-    && echo 'CMAKE_FLAGS+=" -DCMAKE_INSTALL_PREFIX:PATH=/duneci/install"' >> /duneci/cmake-flags/install_path \
-    && echo 'CMAKE_FLAGS+=" -DCMAKE_GENERATOR="Ninja' >> /duneci/cmake-flags/cmake_generator
+RUN    echo 'CMAKE_FLAGS+=" -DDUNE_PYTHON_VIRTUALENV_SETUP=1"' >> /duneci/cmake-flags/dune-copasi \
+    && echo 'CMAKE_FLAGS+=" -DDUNE_PYTHON_VIRTUALENV_PATH=/duneci/install/dune-python-venv"' >> /duneci/cmake-flags/dune-copasi \
+    && echo 'CMAKE_FLAGS+=" -DCMAKE_PREFIX_PATH:PATH=/duneci/install"' >> /duneci/cmake-flags/dune-copasi \
+    && echo 'CMAKE_FLAGS+=" -DCMAKE_INSTALL_PREFIX:PATH=/duneci/install"' >> /duneci/cmake-flags/dune-copasi \
+    && echo 'CMAKE_FLAGS+=" -DCMAKE_GENERATOR="Ninja' >> /duneci/cmake-flags/dune-copasi
 WORKDIR /duneci/modules
 RUN mkdir -p /duneci/modules/dune-copasi/.ci
 COPY --chown=duneci ./.ci /duneci/modules/dune-copasi/.ci
@@ -27,10 +27,10 @@ FROM setup-env AS build-env
 ENV DUNE_OPTIONS_FILE=/duneci/dune.opts
 ENV PATH=/duneci/install/bin:$PATH
 
-RUN    echo 'CMAKE_FLAGS+=" -DDUNE_COPASI_SD_EXECUTABLE=ON"' >> /duneci/cmake-flags/production \
-    && echo 'CMAKE_FLAGS+=" -DDUNE_COPASI_MD_EXECUTABLE=ON"' >> /duneci/cmake-flags/production \
-    && echo 'CMAKE_FLAGS+=" -DCMAKE_CXX_FLAGS_RELEASE='"'"'-O3 -fvisibility=hidden -fpic -static-libstdc++'"'"' "' >> /duneci/cmake-flags/production \
-    && echo 'CMAKE_FLAGS+=" -DCMAKE_BUILD_TYPE=Release"' >> /duneci/cmake-flags/production
+RUN    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 \
+    && echo 'CMAKE_FLAGS+=" -DCMAKE_CXX_FLAGS_RELEASE='"'"'-O3 -fvisibility=hidden -fpic -static-libstdc++'"'"' "' >> /duneci/cmake-flags/dune-copasi \
+    && echo 'CMAKE_FLAGS+=" -DCMAKE_BUILD_TYPE=Release"' >> /duneci/cmake-flags/dune-copasi
 
 WORKDIR /duneci/modules
 COPY --chown=duneci ./ /duneci/modules/dune-copasi

cmake/modules/DuneCopasiCPack.cmake

@@ -10,4 +10,6 @@ set(CPACK_PACKAGE_VERSION_MAJOR "0")
 set(CPACK_PACKAGE_VERSION_MINOR "4")
 set(CPACK_PACKAGE_VERSION_PATCH "0")
 set(CPACK_PACKAGE_INSTALL_DIRECTORY "CMake ${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}")
+
+set(CPACK_DEBIAN_PACKAGE_DEPENDS "libscotchparmetis-dev,libldl2,libspqr2,libumfpack5,libarpack++2c2a,libsuperlu5,libgmpxx4ldbl,libopenblas-base,libtiff5,libmuparser2v5")
 include(CPack)