Use 1.9.4 branch of cadical fork

Lipen · Mar 2, 2024 · 5803c00 · 5803c00
1 parent d64943d
commit 5803c00
Showing 1 changed file with 13 additions and 10 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -49,11 +49,13 @@ jobs:
       - name: Build Cadical
         working-directory: kotlin-satlib-jni
         run: |
-          git clone --depth=1 https://github.com/Lipen/cadical solvers/cadical-src
+          git clone --depth=1 --branch lipen/1.9.4 https://github.com/Lipen/cadical solvers/cadical-src
           cd solvers/cadical-src
-          meson setup builddir --buildtype release --strip --libdir=lib --prefix=$(realpath install)
-          meson compile -C builddir
-          meson install -C builddir
+          ./configure -fPIC
+          make -j8 shared
+          install -m 644 src/cadical.hpp -Dt install/include/cadical
+          install -m 644 build/libcadical.so -Dt install/lib
+          strip -s install/lib/libcadical.so
 
       - name: Build CryptoMiniSat
         working-directory: kotlin-satlib-jni
@@ -174,11 +176,12 @@ jobs:
       - name: Build Cadical
         working-directory: kotlin-satlib-jni
         run: |
-          git clone --depth=1 https://github.com/Lipen/cadical solvers/cadical-src
+          git clone --depth=1 --branch lipen/1.9.4 https://github.com/Lipen/cadical solvers/cadical-src
           cd solvers/cadical-src
-          meson setup builddir --buildtype release --strip --prefix=$(realpath install)
-          meson compile -C builddir
-          meson install -C builddir
+          ./configure -fPIC
+          make -j8 dll
+          install src/cadical.hpp -Dt install/include/cadical
+          install build/cadical.dll -Dt install/lib
 
       - name: Build CryptoMiniSat
         working-directory: kotlin-satlib-jni
@@ -207,7 +210,7 @@ jobs:
         run: |
           cp kotlin-satlib-jni/solvers/minisat-src/install/bin/libminisat.dll C:/Windows/
           cp kotlin-satlib-jni/solvers/glucose-src/install/bin/libglucose.dll C:/Windows/
-          cp kotlin-satlib-jni/solvers/cadical-src/install/bin/libcadical.dll C:/Windows/
+          cp kotlin-satlib-jni/solvers/cadical-src/install/lib/cadical.dll C:/Windows/
           cp kotlin-satlib-jni/solvers/cms-src/install/bin/libcryptominisat5win.dll C:/Windows/
           cp kotlin-satlib-jna/solvers/kissat-src/install/lib/kissat.dll C:/Windows/
 
@@ -250,6 +253,6 @@ jobs:
             kotlin-satlib-jni/build/lib/jcms.dll
             kotlin-satlib-jni/solvers/minisat-src/install/bin/libminisat.dll
             kotlin-satlib-jni/solvers/glucose-src/install/bin/libglucose.dll
-            kotlin-satlib-jni/solvers/cadical-src/install/bin/libcadical.dll
+            kotlin-satlib-jni/solvers/cadical-src/install/lib/cadical.dll
             kotlin-satlib-jni/solvers/cms-src/install/bin/libcryptominisat5win.dll
             kotlin-satlib-jna/solvers/kissat-src/install/lib/kissat.dll