From 3b5f42cf49f6fc42f3750b5e85e01d0a26271907 Mon Sep 17 00:00:00 2001 From: SoftFever <103989404+SoftFever@users.noreply.github.com> Date: Sat, 30 Sep 2023 10:32:15 +0800 Subject: [PATCH] Fix XCode 15 build errors and bump version to 1.8.0 --- CMakeLists.txt | 4 ++++ version.inc | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 261c975ee1..66aae9967c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -113,6 +113,10 @@ if (MSVC) add_compile_options(/wd4244 /wd4267) endif () +if (${CMAKE_CXX_COMPILER_ID} STREQUAL "AppleClang" AND ${CMAKE_CXX_COMPILER_VERSION} VERSION_GREATER 15) + add_compile_definitions(BOOST_NO_CXX98_FUNCTION_BASE _HAS_AUTO_PTR_ETC=0) +endif() + if (MINGW) add_compile_options(-Wa,-mbig-obj) endif () diff --git a/version.inc b/version.inc index da87ebbce8..3a81f235b2 100644 --- a/version.inc +++ b/version.inc @@ -10,7 +10,7 @@ endif() if(NOT DEFINED BBL_INTERNAL_TESTING) set(BBL_INTERNAL_TESTING "1") endif() -set(SoftFever_VERSION "1.7.0") +set(SoftFever_VERSION "1.8.0-dev") string(REGEX MATCH "^([0-9]+)\\.([0-9]+)\\.([0-9]+)" SoftFever_VERSION_MATCH ${SoftFever_VERSION}) set(ORCA_VERSION_MAJOR ${CMAKE_MATCH_1})