diff options
| author | Andres Noetzli <andres.noetzli@gmail.com> | 2021-06-18 20:59:07 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-18 20:59:07 -0700 |
| commit | 6834d97fee2dc560ede9d2ca260acc292adfc731 (patch) | |
| tree | 5a730783bfc9f9414097f0f423b2b050b944b3ae /cmake | |
| parent | 470431f629efbfd3a2bf994c155b78a879ea7beb (diff) | |
| parent | af031c2938f753f555893b39c3cf1f7467b284fc (diff) | |
Merge branch 'master' into nprocnproc
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/FindCaDiCaL.cmake | 12 | ||||
| -rw-r--r-- | cmake/FindPoly.cmake | 4 | ||||
| -rw-r--r-- | cmake/deps-utils/Poly-patch-cmake.patch | 13 |
3 files changed, 10 insertions, 19 deletions
diff --git a/cmake/FindCaDiCaL.cmake b/cmake/FindCaDiCaL.cmake index 80fa2e4ec..0c095a529 100644 --- a/cmake/FindCaDiCaL.cmake +++ b/cmake/FindCaDiCaL.cmake @@ -47,8 +47,6 @@ if(NOT CaDiCaL_FOUND_SYSTEM) include(CheckSymbolExists) include(ExternalProject) - fail_if_include_missing("sys/resource.h" "CaDiCaL") - set(CaDiCaL_VERSION "88623ef0866370448c34f6e320c148fc18e6f4cc") # avoid configure script and instantiate the makefile manually the configure @@ -110,6 +108,16 @@ set_target_properties( CaDiCaL PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${CaDiCaL_INCLUDE_DIR}" ) +if (WIN32) + # The Windows version of CaDiCaL calls GetProcessMemoryInfo(), which is + # defined in the Process Status API (psapi), so we declare it as a dependency + # of the CaDiCaL library (without this, linking a static cvc5 executable + # fails). + set_target_properties( + CaDiCaL PROPERTIES IMPORTED_LINK_INTERFACE_LIBRARIES psapi + ) +endif () + mark_as_advanced(CaDiCaL_FOUND) mark_as_advanced(CaDiCaL_FOUND_SYSTEM) mark_as_advanced(CaDiCaL_INCLUDE_DIR) diff --git a/cmake/FindPoly.cmake b/cmake/FindPoly.cmake index 734962423..e11d85c3f 100644 --- a/cmake/FindPoly.cmake +++ b/cmake/FindPoly.cmake @@ -51,10 +51,6 @@ if(NOT Poly_FOUND_SYSTEM) if(CCWIN) # Roughly following https://stackoverflow.com/a/44383330/2375725 set(patchcmd - COMMAND - patch - <SOURCE_DIR>/src/CMakeLists.txt - ${CMAKE_CURRENT_LIST_DIR}/deps-utils/Poly-patch-cmake.patch # Avoid %z and %llu format specifiers COMMAND find <SOURCE_DIR>/ -type f -exec sed -i.orig "s/%z[diu]/%\" PRIu64 \"/g" {} + diff --git a/cmake/deps-utils/Poly-patch-cmake.patch b/cmake/deps-utils/Poly-patch-cmake.patch deleted file mode 100644 index fe8528f70..000000000 --- a/cmake/deps-utils/Poly-patch-cmake.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index f91e3e8..6205689 100755 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -38,7 +38,7 @@ set(poly_SOURCES - ) - - if (NOT HAVE_OPEN_MEMSTREAM) -- set(poly_SOURCES "utils/open_memstream.c ${poly_SOURCES}") -+ set(poly_SOURCES utils/open_memstream.c ${poly_SOURCES}) - endif() - - set(polyxx_SOURCES |