From ac44a9b53b367c32dfa756dbde76920d4785d03b Mon Sep 17 00:00:00 2001 From: Gereon Kremer Date: Thu, 12 May 2022 18:15:27 -0700 Subject: [PATCH] Update CoCoALib version (#8757) This PR updates our cmake scripts for CoCoALib to use the latest and greatest version. While we don't actually want to use any of the new features, the new version finally uses an Apache license! --- cmake/FindCoCoA.cmake | 10 +++------- cmake/deps-utils/CoCoA-patch-0.99712.patch | 13 ------------- 2 files changed, 3 insertions(+), 20 deletions(-) delete mode 100644 cmake/deps-utils/CoCoA-patch-0.99712.patch diff --git a/cmake/FindCoCoA.cmake b/cmake/FindCoCoA.cmake index c6232807a..c5dbe2642 100644 --- a/cmake/FindCoCoA.cmake +++ b/cmake/FindCoCoA.cmake @@ -41,7 +41,7 @@ if(NOT CoCoA_FOUND_SYSTEM) include(ExternalProject) - set(CoCoA_VERSION "0.99712") + set(CoCoA_VERSION "0.99800") if("${CMAKE_GENERATOR}" STREQUAL "Unix Makefiles") # use $(MAKE) instead of "make" to allow for parallel builds @@ -54,12 +54,8 @@ if(NOT CoCoA_FOUND_SYSTEM) ExternalProject_Add( CoCoA-EP ${COMMON_EP_CONFIG} - URL "http://cocoa.dima.unige.it/cocoalib/tgz/CoCoALib-${CoCoA_VERSION}.tgz" - URL_HASH SHA1=873d0b60800cd3852939816ce0aa2e7f72dac4ce - # CoCoA requires C++14, but the check does not work with compilers that - # default to C++17 or newer. The patch fixes the check. - PATCH_COMMAND patch -p1 -d - -i ${CMAKE_CURRENT_LIST_DIR}/deps-utils/CoCoA-patch-0.99712.patch + URL "https://cocoa.dima.unige.it/cocoa/cocoalib/tgz/CoCoALib-${CoCoA_VERSION}.tgz" + URL_HASH SHA1=f4fd9ea846b245adb3ee955dd8af9aaf192a9df3 BUILD_IN_SOURCE YES CONFIGURE_COMMAND ./configure --prefix= BUILD_COMMAND ${make_cmd} library diff --git a/cmake/deps-utils/CoCoA-patch-0.99712.patch b/cmake/deps-utils/CoCoA-patch-0.99712.patch deleted file mode 100644 index 464d39f83..000000000 --- a/cmake/deps-utils/CoCoA-patch-0.99712.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/configuration/cxx14.sh b/configuration/cxx14.sh -index cdbf338..0436983 100755 ---- a/configuration/cxx14.sh -+++ b/configuration/cxx14.sh -@@ -40,7 +40,7 @@ int main() - { - int ReturnCode = 0; // will mean c++14 compliant - std::cout << "C++ version: " << __cplusplus << std::endl; --#if __cplusplus < 201400L -+#if __cplusplus < 201400L || __cplusplus >= 201703L - ReturnCode = 1; // NOT C++14 compilant - #endif - return ReturnCode; -- 2.30.2