Support dune-copasi 2

spatial-model-editor · Nov 2, 2023 · 60a53ea · 60a53ea
1 parent 360113c
commit 60a53ea
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -4,7 +4,7 @@ on: push
 
 env:
   SME_DEPS_COMMON_VERSION: "2023.07.12"
-  DUNE_COPASI_VERSION: "releases/1.1"
+  DUNE_COPASI_VERSION: "master"
 
 jobs:
   linux:
@@ -14,7 +14,6 @@ jobs:
       INSTALL_PREFIX: "/opt/smelibs"
       SUDOCMD: "sudo"
       OS_TARGET: "linux"
-      DUNE_USE_FALLBACK_FILESYSTEM: "ON"
       CC: "clang"
       CXX: "clang++"
     defaults:
@@ -33,7 +32,7 @@ jobs:
           sudo update-alternatives --remove-all clang++ || echo "nothing to remove"
           sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-16 100
           sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-16 100
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Build script
         run: ./build.sh
       - uses: actions/upload-artifact@v3
@@ -42,18 +41,17 @@ jobs:
 
   macos:
     name: MacOS
-    runs-on: macos-11
+    runs-on: macos-13
     env:
       INSTALL_PREFIX: "/opt/smelibs"
       SUDOCMD: "sudo"
-      MACOSX_DEPLOYMENT_TARGET: "10.14"
+      # MACOSX_DEPLOYMENT_TARGET: "10.14"
       OS_TARGET: "osx"
-      DUNE_USE_FALLBACK_FILESYSTEM: "ON"
     defaults:
       run:
         shell: bash
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Build script
         run: ./build.sh
       - uses: actions/upload-artifact@v3
@@ -67,12 +65,11 @@ jobs:
       INSTALL_PREFIX: "/c/smelibs"
       SUDOCMD: ""
       OS_TARGET: "win64-mingw"
-      DUNE_USE_FALLBACK_FILESYSTEM: "OFF"
     defaults:
       run:
         shell: msys2 {0}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: msys2/setup-msys2@v2
         with:
           msystem: MINGW64

diff --git a/build.sh b/build.sh
@@ -32,6 +32,13 @@ export DUNE_COPASI_USE_STATIC_DEPS=ON
 export CMAKE_INSTALL_PREFIX=$DEPSDIR
 export MAKE_OPTIONS="-j2 VERBOSE=1"
 export CMAKE_CXX_FLAGS='-fvisibility=hidden'
+export BUILD_SHARED_LIBS=OFF
+export CMAKE_DISABLE_FIND_PACKAGE_MPI=ON
+export DUNE_ENABLE_PYTHONBINDINGS=OFF
+export DUNE_PDELAB_ENABLE_TRACING=OFF
+export DUNE_COPASI_DISABLE_FETCH_PACKAGE_ExprTk=ON
+export DUNE_COPASI_DISABLE_FETCH_PACKAGE_parafields=ON
+export DUNE_COPASI_USE_PARAFIELDS=OFF
 if [[ $MSYSTEM ]]; then
     # on windows add flags to support large object files
     # https://stackoverflow.com/questions/16596876/object-file-has-too-many-sections