Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion M2/cmake/FindFlint.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
# FLINT_FOUND - system has the FLINT library with correct version
# FLINT_ROOT - the FLINT install prefix
# FLINT_INCLUDE_DIR - the FLINT include directory
# FLINT_LIBRARY_DIR - the directory containing the FLINT library
# FLINT_LIBRARIES - the FLINT library
# FLINT_VERSION - FLINT version

Expand Down Expand Up @@ -89,8 +90,12 @@ if(NOT FLINT_FOUND)

string(REGEX REPLACE "/include.*" "" FLINT_ROOT "${FLINT_INCLUDE_DIR}")

if(FLINT_LIBRARIES)
get_filename_component(FLINT_LIBRARY_DIR "${FLINT_LIBRARIES}" DIRECTORY)
endif()

include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Flint DEFAULT_MSG FLINT_ROOT FLINT_INCLUDE_DIR FLINT_LIBRARIES FLINT_VERSION_OK)
find_package_handle_standard_args(Flint DEFAULT_MSG FLINT_ROOT FLINT_INCLUDE_DIR FLINT_LIBRARY_DIR FLINT_LIBRARIES FLINT_VERSION_OK)

mark_as_advanced(FLINT_ROOT FLINT_INCLUDE_DIR FLINT_LIBRARIES)

Expand Down
7 changes: 6 additions & 1 deletion M2/cmake/FindMPFR.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#
# MPFR_FOUND - system has MPFR lib with correct version
# MPFR_INCLUDE_DIRS - the MPFR include directory
# MPFR_LIBRARY_DIRS - the directory containing the MPFR library
# MPFR_LIBRARIES - the MPFR library
# MPFR_VERSION - MPFR version

Expand Down Expand Up @@ -90,8 +91,12 @@ if(NOT MPFR_VERSION_OK)

string(REGEX REPLACE "/include(/${CMAKE_LIBRARY_ARCHITECTURE}$)?" "" MPFR_ROOT "${MPFR_INCLUDE_DIRS}")

if(MPFR_LIBRARIES)
get_filename_component(MPFR_LIBRARY_DIRS "${MPFR_LIBRARIES}" DIRECTORY)
endif()

include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(MPFR DEFAULT_MSG MPFR_ROOT MPFR_INCLUDE_DIRS MPFR_LIBRARIES MPFR_VERSION_OK)
find_package_handle_standard_args(MPFR DEFAULT_MSG MPFR_ROOT MPFR_INCLUDE_DIRS MPFR_LIBRARY_DIRS MPFR_LIBRARIES MPFR_VERSION_OK)

mark_as_advanced(MPFR_ROOT MPFR_INCLUDE_DIRS MPFR_LIBRARIES)

Expand Down
6 changes: 3 additions & 3 deletions M2/cmake/build-libraries.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -485,8 +485,8 @@ endif()

# https://github.com/algebraic-solving/msolve
ExternalProject_Add(build-msolve
URL https://github.com/algebraic-solving/msolve/archive/refs/tags/v0.9.5.tar.gz
URL_HASH SHA256=92b94775cd5a046de307e2ad0fc576d2631e43fbd0eb7749517a033d7e77ddf4
URL https://github.com/algebraic-solving/msolve/archive/refs/tags/v0.10.1.tar.gz
URL_HASH SHA256=ce0743cc33d1dc8484193268d9220e8624ed015e521903b9228b3b38a5981291
PREFIX libraries/msolve
SOURCE_DIR libraries/msolve/build
DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/BUILD/tarfiles
Expand All @@ -498,7 +498,7 @@ ExternalProject_Add(build-msolve
$<$<BOOL:${OpenMP_FOUND}>:--enable-openmp>
"CPPFLAGS=${CPPFLAGS} -I${GMP_INCLUDE_DIRS} -I${MPFR_INCLUDE_DIRS} -I${FLINT_INCLUDE_DIR}"
CFLAGS=${CFLAGS}
"LDFLAGS=${LDFLAGS} -L${GMP_LIBRARY_DIRS} -L${MPFR_LIBRARIES} -L${FLINT_LIBRARIES}"
"LDFLAGS=${LDFLAGS} -L${GMP_LIBRARY_DIRS} -L${MPFR_LIBRARY_DIRS} -L${FLINT_LIBRARY_DIR}"
CC=${CMAKE_C_COMPILER}
"OPENMP_CFLAGS=${OpenMP_C_FLAGS} ${OpenMP_C_LDLIBS}"
BUILD_COMMAND ${MAKE} -j${PARALLEL_JOBS}
Expand Down
4 changes: 2 additions & 2 deletions M2/libraries/msolve/Makefile.in
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
HOMEPAGE = https://msolve.lip6.fr/
VERSION = 0.9.5
SHA256SUM = 92b94775cd5a046de307e2ad0fc576d2631e43fbd0eb7749517a033d7e77ddf4
VERSION = 0.10.1
SHA256SUM = ce0743cc33d1dc8484193268d9220e8624ed015e521903b9228b3b38a5981291
URL = https://github.com/algebraic-solving/msolve/archive/refs/tags
TARFILE = v$(VERSION).tar.gz
LICENSEFILES = README.md COPYING
Expand Down
Loading