From 94fd160bf5ac5df484653a339ef88036d92437a5 Mon Sep 17 00:00:00 2001 From: Asger Gitz-Johansen Date: Fri, 28 Apr 2023 22:38:00 +0200 Subject: [PATCH 1/4] chore: bump z3 version to z3-4.12.1 and expr version to v3.0.1 --- CMakeLists.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c234a22..6b57e5e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,7 +20,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. cmake_minimum_required(VERSION 3.18) -project(expr VERSION 3.0.0) +project(expr VERSION 3.0.1) include(cmake/CPM.cmake) configure_file(src/config.h.in config.h) set(CMAKE_CXX_STANDARD 20) @@ -41,8 +41,9 @@ CPMAddPackage("gh:sillydan1/argvparse@1.2.3") if(ENABLE_Z3) include(cmake/Z3.cmake) - get_z3_zip_file(z3-4.11.2) - CPMAddPackage(NAME z3 VERSION z3-4.11.2 URL ${z3vstr}) + set(Z3_VERSION_NUMBER z3-4.12.1) + get_z3_zip_file(${Z3_VERSION_NUMBER}) + CPMAddPackage(NAME z3 VERSION ${Z3_VERSION_NUMBER} URL ${z3vstr}) endif() set(${PROJECT_NAME}_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR} CACHE STRING "expr_BUILD_DIR" FORCE) From 4a11d2f657cbcec0bcd21765b19a4b7917ca8ddc Mon Sep 17 00:00:00 2001 From: Asger Gitz-Johansen Date: Wed, 24 May 2023 19:56:49 +0200 Subject: [PATCH 2/4] fix: include cstdint in divide to get INT32_MIN macro --- src/operations/divide.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/operations/divide.cpp b/src/operations/divide.cpp index c5077b1..6da5c2d 100644 --- a/src/operations/divide.cpp +++ b/src/operations/divide.cpp @@ -22,6 +22,7 @@ */ #include "operations/divide.h" #include "operations/util.h" +#include #include using namespace expr; From 99b1a756dfc7e713a3c10090031086cc0569e258 Mon Sep 17 00:00:00 2001 From: Asger Gitz-Johansen Date: Wed, 24 May 2023 19:56:57 +0200 Subject: [PATCH 3/4] chore: update version --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6b57e5e..f3a7ea1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,7 +20,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. cmake_minimum_required(VERSION 3.18) -project(expr VERSION 3.0.1) +project(expr VERSION 3.0.2) include(cmake/CPM.cmake) configure_file(src/config.h.in config.h) set(CMAKE_CXX_STANDARD 20) From 01a55449b00dd7f832304d6993a20c7b20b65aed Mon Sep 17 00:00:00 2001 From: Asger Gitz-Johansen Date: Mon, 18 Sep 2023 21:57:31 +0200 Subject: [PATCH 4/4] core: update versions z3 patch update CPM patch update --- CMakeLists.txt | 4 ++-- cmake/CPM.cmake | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f3a7ea1..6d15525 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,7 +20,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. cmake_minimum_required(VERSION 3.18) -project(expr VERSION 3.0.2) +project(expr VERSION 3.0.3) include(cmake/CPM.cmake) configure_file(src/config.h.in config.h) set(CMAKE_CXX_STANDARD 20) @@ -41,7 +41,7 @@ CPMAddPackage("gh:sillydan1/argvparse@1.2.3") if(ENABLE_Z3) include(cmake/Z3.cmake) - set(Z3_VERSION_NUMBER z3-4.12.1) + set(Z3_VERSION_NUMBER z3-4.12.2) get_z3_zip_file(${Z3_VERSION_NUMBER}) CPMAddPackage(NAME z3 VERSION ${Z3_VERSION_NUMBER} URL ${z3vstr}) endif() diff --git a/cmake/CPM.cmake b/cmake/CPM.cmake index 601d072..9c90172 100644 --- a/cmake/CPM.cmake +++ b/cmake/CPM.cmake @@ -1,4 +1,4 @@ -set(CPM_DOWNLOAD_VERSION 0.38.0) +set(CPM_DOWNLOAD_VERSION 0.38.5) if(CPM_SOURCE_CACHE) # Expand relative path. This is important if the provided path contains a tilde (~)