Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

4ti2 version bump #2914

Merged
merged 2 commits into from
Aug 25, 2023
Merged
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
5 changes: 3 additions & 2 deletions M2/cmake/build-libraries.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -823,12 +823,13 @@ set(4ti2_PROGRAMS
qsolve rays walk zbasis zsolve hilbert graver ppi genmodel gensymm output)
list(TRANSFORM 4ti2_PROGRAMS PREPEND ${M2_HOST_PREFIX}/bin/ OUTPUT_VARIABLE 4ti2_PROGRAMS)
ExternalProject_Add(build-4ti2
URL https://github.com/4ti2/4ti2/releases/download/Release_1_6_9/4ti2-1.6.9.tar.gz
URL_HASH SHA256=3053e7467b5585ad852f6a56e78e28352653943e7249ad5e5174d4744d174966
URL https://github.com/4ti2/4ti2/releases/download/Release_1_6_10/4ti2-1.6.10.tar.gz
URL_HASH SHA256=f7c191beb14246b643e4fd5b18b53d9966693b9e6d3a569441a0e3ca14b1a86b
PREFIX libraries/4ti2
SOURCE_DIR libraries/4ti2/build
DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/BUILD/tarfiles
BUILD_IN_SOURCE ON
PATCH_COMMAND mkdir swig # needed because the tar doesn't have a swig directory but 4ti2's Makefile.am seems to need it
CONFIGURE_COMMAND autoreconf -vif
COMMAND ${CONFIGURE} --prefix=${M2_HOST_PREFIX}
#-C --cache-file=${CONFIGURE_CACHE}
Expand Down
9 changes: 4 additions & 5 deletions M2/libraries/4ti2/Makefile.in
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
# temporary beta testing version
VERSION = 1.6.9
VERSION = 1.6.10
TARDIR = 4ti2-$(VERSION)

# PATCHFILE = @abs_srcdir@/patch-$(VERSION)
PRECONFIGURE = autoreconf -vif
PRECONFIGURE = mkdir -p swig && autoreconf -vif

# URL = http://www.4ti2.de/version_$(VERSION)
# URL = https://github.com/4ti2/4ti2/releases/download/Release_1_6_9/4ti2-1.6.9.tar.gz
URL = http://macaulay2.com/Downloads/OtherSourceCode
VERSION_ = $(shell echo $(VERSION) | sed 's/\./_/g')
URL = https://github.com/4ti2/4ti2/releases/download/Release_$(VERSION_)

ifeq (@ENABLE_STRIP@,yes)
INSTALLTARGET = install-strip
Expand Down
Loading