Skip to content

Commit e41546e

Browse files
committed
Fix build on clang compiler (fbracket-depth)
Bump macOS to 13.3 because glaze needs this
1 parent 9ddd7f3 commit e41546e

3 files changed

Lines changed: 7 additions & 2 deletions

File tree

CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -410,6 +410,11 @@ else()
410410
endif()
411411
endif()
412412

413+
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang$")
414+
# Fix template recursion limit hit by glaze
415+
target_compile_options(${EXE_NAME} PRIVATE "-fbracket-depth=1024")
416+
endif()
417+
413418
# Include directories
414419
target_include_directories(${EXE_NAME}
415420
PUBLIC

CMakePresets.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@
262262
"name": "macos-parent",
263263
"cacheVariables": {
264264
"EDITOR_PREFIX_PATH_APPEND": "$env{EASYRPG_BUILDSCRIPTS}/macos/qt/6.10.1/macos",
265-
"CMAKE_OSX_DEPLOYMENT_TARGET": "10.15",
265+
"CMAKE_OSX_DEPLOYMENT_TARGET": "13.3",
266266
"CMAKE_OSX_ARCHITECTURES": "arm64"
267267
},
268268
"environment": {

builds/cmake/CMakePresets.json.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"displayName": "macOS",
4040
"cacheVariables": {
4141
"EDITOR_PREFIX_PATH_APPEND": "$env{EASYRPG_BUILDSCRIPTS}/macos/qt/6.10.1/macos",
42-
"CMAKE_OSX_DEPLOYMENT_TARGET": "10.15",
42+
"CMAKE_OSX_DEPLOYMENT_TARGET": "13.3",
4343
"CMAKE_OSX_ARCHITECTURES": "arm64"
4444
},
4545
"environment": {

0 commit comments

Comments
 (0)