From 25ca470af2a16c862c4a1004e2797a7a62f25f06 Mon Sep 17 00:00:00 2001 From: Vojtech Bubnik Date: Tue, 1 Dec 2020 16:54:20 +0100 Subject: [PATCH] The new OSX 11 (Big Sur) is not compatible with wxWidgets 3.1.3. Let's use patched wxWidgets 3.1.4, even though it is not quite tested. Use the tested patched wxWidgets 3.1.3 everywhere else. --- deps/wxWidgets/wxWidgets.cmake | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/deps/wxWidgets/wxWidgets.cmake b/deps/wxWidgets/wxWidgets.cmake index ee8a22c4f36..ee38309a687 100644 --- a/deps/wxWidgets/wxWidgets.cmake +++ b/deps/wxWidgets/wxWidgets.cmake @@ -1,4 +1,11 @@ -set(_wx_git_tag v3.1.3-patched) +if (APPLE AND ${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm") + # The new OSX 11 (Big Sur) is not compatible with wxWidgets 3.1.3. + # Let's use patched wxWidgets 3.1.4, even though it is not quite tested. + set(_wx_git_tag v3.1.4-patched) +else () + # Use the tested patched wxWidgets 3.1.3 everywhere else. + set(_wx_git_tag v3.1.3-patched) +endif () # set(_patch_command "") set(_wx_toolkit "")