From: Aina Niemetz <aina.niemetz@gmail.com>
Date: Mon, 13 Jun 2022 12:36:18 +0000 (-0700)
Subject: bv sat solvers: Update CaDiCaL and Kissat to most recent release versions. (#8877)
X-Git-Tag: cvc5-1.0.1~54
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=853d497867ffeb16f6b780c30f92c8a694a5f062;p=cvc5.git

bv sat solvers: Update CaDiCaL and Kissat to most recent release versions. (#8877)
---

diff --git a/cmake/FindCaDiCaL.cmake b/cmake/FindCaDiCaL.cmake
index f6be210fd..2f8105c7f 100644
--- a/cmake/FindCaDiCaL.cmake
+++ b/cmake/FindCaDiCaL.cmake
@@ -47,7 +47,8 @@ if(NOT CaDiCaL_FOUND_SYSTEM)
   include(CheckSymbolExists)
   include(ExternalProject)
 
-  set(CaDiCaL_VERSION "rel-1.4.1")
+  set(CaDiCaL_VERSION "rel-1.5.2")
+  set(CaDiCaL_CHECKSUM "8bc2c3bdf4ef3780f001b31c2fe02168f3bb34b8")
 
   # avoid configure script and instantiate the makefile manually the configure
   # scripts unnecessarily fails for cross compilation thus we do the bare
@@ -82,7 +83,7 @@ if(NOT CaDiCaL_FOUND_SYSTEM)
     ${COMMON_EP_CONFIG}
     BUILD_IN_SOURCE ON
     URL https://github.com/arminbiere/cadical/archive/${CaDiCaL_VERSION}.tar.gz
-    URL_HASH SHA1=ad3be225f20e5c5b3883290478282698624c14a5
+    URL_HASH SHA1=${CaDiCaL_CHECKSUM}
     CONFIGURE_COMMAND mkdir -p <SOURCE_DIR>/build
     # avoid configure script, prepare the makefile manually
     COMMAND ${CMAKE_COMMAND} -E copy <SOURCE_DIR>/makefile.in
diff --git a/cmake/FindKissat.cmake b/cmake/FindKissat.cmake
index ff355cbec..624d03fe8 100644
--- a/cmake/FindKissat.cmake
+++ b/cmake/FindKissat.cmake
@@ -48,15 +48,15 @@ if(NOT Kissat_FOUND_SYSTEM)
 
   fail_if_include_missing("sys/resource.h" "Kissat")
 
-  # TODO(mpreiner): use the version from github?
-  set(Kissat_VERSION "sc2020-039805f2")
+  set(Kissat_VERSION "sc2021")
+  set(Kissat_CHECKSUM "2541a45e023f51b39686865c40350ce091b5bd50")
 
   ExternalProject_Add(
     Kissat-EP
     ${COMMON_EP_CONFIG}
     BUILD_IN_SOURCE ON
-    URL http://fmv.jku.at/kissat/kissat-${Kissat_VERSION}.tar.xz
-    URL_HASH SHA1=5125efa17d383c7e7c1e6d803e3422b17cebcedb
+    URL https://github.com/arminbiere/kissat/archive/${Kissat_VERSION}.tar.gz
+    URL_HASH SHA1=${Kissat_CHECKSUM}
     CONFIGURE_COMMAND <SOURCE_DIR>/configure -fPIC --quiet
                       CC=${CMAKE_C_COMPILER}
     INSTALL_COMMAND ${CMAKE_COMMAND} -E copy <SOURCE_DIR>/build/libkissat.a