From e8cfbd5a6ffd63a3dcea09a2940b4765d5d34a52 Mon Sep 17 00:00:00 2001 From: Jake Turner Date: Sat, 24 Apr 2021 16:45:46 +0100 Subject: [PATCH] Mac build set the minimum SDK version to 10.15 --- CMakeLists.txt | 1 + qrenderdoc/CMakeLists.txt | 3 +++ 2 files changed, 4 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 808ba2254..313801200 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 2.8.12) if(APPLE) SET(CMAKE_OSX_ARCHITECTURES "x86_64;arm64" CACHE STRING "Build architectures for Mac OS X" FORCE) + SET(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum SDK for Mac OS X" FORCE) endif() # Configure some stuff that needs to be set really early diff --git a/qrenderdoc/CMakeLists.txt b/qrenderdoc/CMakeLists.txt index 40413c752..3c8d0d6e2 100644 --- a/qrenderdoc/CMakeLists.txt +++ b/qrenderdoc/CMakeLists.txt @@ -37,6 +37,7 @@ set(QMAKE_CONFIG "debug") set(QMAKE_LDFLAGS "") set(QMAKE_CXXFLAGS "") set(QMAKE_RPATHDIR "") +set(QMAKE_OSX_DEPLOYMENT_TARGET "") set(SWIG_FLAGS "") if(RELEASE_MODE) @@ -84,6 +85,7 @@ if(ENABLE_VULKAN) endif() if(APPLE) + set(QMAKE_OSX_DEPLOYMENT_TARGET ${CMAKE_OSX_DEPLOYMENT_TARGET}) set(QMAKE_RPATHDIR "@executable_path/../lib ") add_custom_command(OUTPUT RenderDoc.icns COMMAND echo Creating OS X Icon @@ -170,6 +172,7 @@ file(WRITE "QMAKE_CXXFLAGS+=${QMAKE_CXXFLAGS}\n" "QMAKE_LFLAGS+=${QMAKE_LDFLAGS}\n" "QMAKE_RPATHDIR+=${QMAKE_RPATHDIR}\n" + "QMAKE_MACOSX_DEPLOYMENT_TARGET=${QMAKE_OSX_DEPLOYMENT_TARGET}\n" "\n" "LIB_SUFFIX=${LIB_SUFFIX}\n" "LIB_SUBFOLDER_TRAIL_SLASH=${LIB_SUBFOLDER_TRAIL_SLASH}\n"