unify builds, without smoldyn exe

virtualcell · May 28, 2024 · 90ff8fd · 90ff8fd
1 parent c8253cc
commit 90ff8fd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 18 deletions.
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -106,16 +106,9 @@ jobs:
           -DCMAKE_CXX_COMPILER=/opt/homebrew/opt/llvm/bin/clang++ \
           -DOPTION_MINGW=ON \
           -DOPTION_TARGET_MESSAGING=OFF \
-          -DOPTION_TARGET_PARALLEL=OFF \
-          -DOPTION_TARGET_CHOMBO2D_SOLVER=OFF \
-          -DOPTION_TARGET_CHOMBO3D_SOLVER=OFF \
-          -DOPTION_TARGET_SMOLDYN_SOLVER=ON \
+          -DOPTION_TARGET_SMOLDYN_SOLVER=OFF \
           -DOPTION_TARGET_FV_SOLVER=ON \
-          -DOPTION_TARGET_STOCHASTIC_SOLVER=ON \
-          -DOPTION_TARGET_NFSIM_SOLVER=ON \
-          -DOPTION_TARGET_MOVINGBOUNDARY_SOLVER=ON \
-          -DOPTION_TARGET_SUNDIALS_SOLVER=ON \
-          -DOPTION_TARGET_HY3S_SOLVERS=OFF \
+          -DOPTION_TARGET_DOCS=ON \
           -B . -S ..
 
           ninja
@@ -137,16 +130,9 @@ jobs:
           -DCMAKE_CXX_COMPILER=/usr/local/opt/llvm/bin/clang++ \
           -DOPTION_MINGW=ON \
           -DOPTION_TARGET_MESSAGING=OFF \
-          -DOPTION_TARGET_PARALLEL=OFF \
-          -DOPTION_TARGET_CHOMBO2D_SOLVER=OFF \
-          -DOPTION_TARGET_CHOMBO3D_SOLVER=OFF \
-          -DOPTION_TARGET_SMOLDYN_SOLVER=ON \
+          -DOPTION_TARGET_SMOLDYN_SOLVER=OFF \
           -DOPTION_TARGET_FV_SOLVER=ON \
-          -DOPTION_TARGET_STOCHASTIC_SOLVER=ON \
-          -DOPTION_TARGET_NFSIM_SOLVER=ON \
-          -DOPTION_TARGET_MOVINGBOUNDARY_SOLVER=ON \
-          -DOPTION_TARGET_SUNDIALS_SOLVER=ON \
-          -DOPTION_TARGET_HY3S_SOLVERS=OFF \
+          -DOPTION_TARGET_DOCS=ON \
           -B . -S ..
 
           ninja
@@ -220,6 +206,7 @@ jobs:
           -DCMAKE_C_COMPILER="clang.exe" \
           -DCMAKE_CXX_COMPILER="clang++.exe" \
           -DOPTION_TARGET_MESSAGING=OFF \
+          -DOPTION_TARGET_SMOLDYN_SOLVER=OFF \
           -DOPTION_TARGET_FV_SOLVER=ON \
           -DOPTION_TARGET_DOCS=OFF \
           -B . -S ..
@@ -267,7 +254,9 @@ jobs:
           cmake \
           -G Ninja \
           -DOPTION_TARGET_MESSAGING=OFF \
+          -DOPTION_TARGET_SMOLDYN_SOLVER=OFF \
           -DOPTION_TARGET_FV_SOLVER=ON \
+          -DOPTION_TARGET_DOCS=ON \
           -B . -S ..
 
           ninja

diff --git a/Dockerfile b/Dockerfile
@@ -11,7 +11,9 @@ WORKDIR /vcellroot/build
 
 RUN /usr/bin/cmake \
     -DOPTION_TARGET_MESSAGING=ON \
+    -DOPTION_TARGET_SMOLDYN_SOLVER=OFF \
     -DOPTION_TARGET_FV_SOLVER=ON \
+    -DOPTION_TARGET_DOCS=OFF \
     .. && \
     make && \
     ctest