From 64fb919bed8e88ad5f2b8028136b51e813375e68 Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Thu, 7 May 2020 17:19:02 +0100 Subject: [PATCH 1/2] Don't package webGL platform support on macOS --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6663ff4e7..2c4401b64 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1632,6 +1632,7 @@ if (NOT is_debug_build) PATTERN "*minimal*${CMAKE_SHARED_LIBRARY_SUFFIX}" EXCLUDE PATTERN "*offscreen*${CMAKE_SHARED_LIBRARY_SUFFIX}" EXCLUDE PATTERN "*quick*${CMAKE_SHARED_LIBRARY_SUFFIX}" EXCLUDE + PATTERN "*webgl*${CMAKE_SHARED_LIBRARY_SUFFIX}" EXCLUDE PATTERN "*_debug${CMAKE_SHARED_LIBRARY_SUFFIX}" EXCLUDE ) install ( From 97078eb8df0348172b080a912250c6487c4595de Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Thu, 7 May 2020 17:42:14 +0100 Subject: [PATCH 2/2] Update build script to macOS minimum version of 10.13 --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2c4401b64..98728dd39 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,15 +10,15 @@ if (APPLE) # # otool -l | grep -A3 LC_VERSION_MIN_MACOSX # - set (CMAKE_OSX_DEPLOYMENT_TARGET 10.10 + set (CMAKE_OSX_DEPLOYMENT_TARGET 10.13 CACHE STRING "Earliest version of OS X supported -Earliest version we can support with Qt 5.8, C++11 & libc++ is 10.10. +Earliest version we can support with Qt 5.14, C++11 & libc++ is 10.13. Do not override this if you intend to build an official deployable installer.") set (CMAKE_OSX_SYSROOT /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk CACHE STRING "Mac OS X SDK to build with -Change this to the newest SDK available that you can install on your system (10.11 preferred). +Change this to the newest SDK available that you can install on your system (10.14 preferred). Do not override this if you intend to build an official deployable installer.") endif (APPLE)