From eb50dad7919329d403b9101b06f9e73163d8b586 Mon Sep 17 00:00:00 2001 From: JackyWoo Date: Fri, 14 Jun 2024 14:03:53 +0800 Subject: [PATCH 1/2] Update version --- version.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/version.txt b/version.txt index 5f4346ec8b..4333dd124c 100644 --- a/version.txt +++ b/version.txt @@ -1,6 +1,6 @@ # You can modify this file to change version SET(VERSION_MAJOR 2) -SET(VERSION_MINOR 0) -SET(VERSION_PATCH 5) -SET(VERSION_STRING v2.0.5) +SET(VERSION_MINOR 1) +SET(VERSION_PATCH 0) +SET(VERSION_STRING v2.1.0) # end of version From 6c3b3fbb80d999417055aa0c510d56c7957962dc Mon Sep 17 00:00:00 2001 From: JackyWoo Date: Fri, 14 Jun 2024 14:07:44 +0800 Subject: [PATCH 2/2] Fix Apple silicon MacOS build error: 32bit platforms are not supported --- cmake/arch.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/arch.cmake b/cmake/arch.cmake index 9604ef62b3..d051dedf53 100644 --- a/cmake/arch.cmake +++ b/cmake/arch.cmake @@ -1,7 +1,7 @@ if (CMAKE_SYSTEM_PROCESSOR MATCHES "amd64|x86_64") set (ARCH_AMD64 1) endif () -if (CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*)") +if (CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*|arm64.*)") set (ARCH_AARCH64 1) endif () if (ARCH_AARCH64 OR CMAKE_SYSTEM_PROCESSOR MATCHES "arm")