diff options
| author | Mathias Preiner <mathias.preiner@gmail.com> | 2021-06-21 16:06:05 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-21 23:06:05 +0000 |
| commit | 4f8927b6e56d55d8b69d525e57f407ff69bc1acd (patch) | |
| tree | 9ac91dd1d0455f8cb4368e54d0ca2b5d473a678d /cmake/FindCaDiCaL.cmake | |
| parent | f78a273345ddf4f1cdfb281fe36ea9e6dbdff726 (diff) | |
Update to CaDiCaL 1.4.1. (#6780)
Diffstat (limited to 'cmake/FindCaDiCaL.cmake')
| -rw-r--r-- | cmake/FindCaDiCaL.cmake | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/cmake/FindCaDiCaL.cmake b/cmake/FindCaDiCaL.cmake index 0c095a529..ce70c5292 100644 --- a/cmake/FindCaDiCaL.cmake +++ b/cmake/FindCaDiCaL.cmake @@ -47,7 +47,7 @@ if(NOT CaDiCaL_FOUND_SYSTEM) include(CheckSymbolExists) include(ExternalProject) - set(CaDiCaL_VERSION "88623ef0866370448c34f6e320c148fc18e6f4cc") + set(CaDiCaL_VERSION "rel-1.4.1") # avoid configure script and instantiate the makefile manually the configure # scripts unnecessarily fails for cross compilation thus we do the bare @@ -72,7 +72,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=16ea51f0274d699f3d3c9e3be7083179eed83abf + URL_HASH SHA1=ad3be225f20e5c5b3883290478282698624c14a5 CONFIGURE_COMMAND mkdir -p <SOURCE_DIR>/build # avoid configure script, prepare the makefile manually COMMAND ${CMAKE_COMMAND} -E copy <SOURCE_DIR>/makefile.in @@ -81,11 +81,6 @@ if(NOT CaDiCaL_FOUND_SYSTEM) sed -i.orig -e "s,@CXX@,${CMAKE_CXX_COMPILER}," -e "s,@CXXFLAGS@,${CXXFLAGS}," -e "s,@MAKEFLAGS@,," <SOURCE_DIR>/build/makefile - # This is a temporary patch until fixed upstream - PATCH_COMMAND - sed -i.orig - "s,#include <vector>,#include <vector>\\\\n#include <cstddef>," - <SOURCE_DIR>/src/reap.hpp BUILD_COMMAND ${make_cmd} -C <SOURCE_DIR>/build libcadical.a INSTALL_COMMAND ${CMAKE_COMMAND} -E copy <SOURCE_DIR>/build/libcadical.a <INSTALL_DIR>/lib/libcadical.a |