From 0ab3b1a3ff33c548ce9080e95ac8c339237bd0d8 Mon Sep 17 00:00:00 2001 From: Michael Maltese Date: Mon, 23 Jan 2017 23:45:54 -0800 Subject: [PATCH] CMake: use CMAKE_OSX_DEPLOYMENT_TARGET --- CMakeLists.txt | 11 +++++------ Source/Core/DolphinQt2/Info.plist.in | 4 ++-- Source/Core/DolphinWX/Info.plist.in | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index dfe0f6cfbf..583267c7d0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,6 +3,11 @@ # cmake_minimum_required(VERSION 3.5.0) set(CMAKE_OSX_ARCHITECTURES "x86_64") +# Minimum OS X version. +# This is inserted into the Info.plist as well. +# Note that the SDK determines the maximum version of which optional +# features can be used, not the minimum required version to run. +set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" CACHE string "") project(dolphin-emu) option(USE_EGL "Enables EGL OpenGL Interface" OFF) @@ -306,12 +311,6 @@ if(APPLE) set(CMAKE_PREFIX_PATH "${CMAKE_PREFIX_PATH};/usr") endif() - # Minimum OS X version. - # This is inserted into the Info.plist as well. - # Note that the SDK determines the maximum version of which optional - # features can be used, not the minimum required version to run. - set(OSX_MIN_VERSION "10.9") - set(TARGET_FLAGS "-mmacosx-version-min=${OSX_MIN_VERSION}") # Do not warn about frameworks that are not available on all architectures. # This avoids a warning when linking with QuickTime. set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-no_arch_warnings") diff --git a/Source/Core/DolphinQt2/Info.plist.in b/Source/Core/DolphinQt2/Info.plist.in index 0e6c6b5c50..a68a24dab1 100644 --- a/Source/Core/DolphinQt2/Info.plist.in +++ b/Source/Core/DolphinQt2/Info.plist.in @@ -75,10 +75,10 @@ NSHumanReadableCopyright Licensed under GPL version 2 or later (GPLv2+) LSMinimumSystemVersion - ${OSX_MIN_VERSION} + ${CMAKE_OSX_DEPLOYMENT_TARGET} NSHighResolutionCapable CSResourcesFileMapped - \ No newline at end of file + diff --git a/Source/Core/DolphinWX/Info.plist.in b/Source/Core/DolphinWX/Info.plist.in index f5564f088a..9210389da6 100644 --- a/Source/Core/DolphinWX/Info.plist.in +++ b/Source/Core/DolphinWX/Info.plist.in @@ -75,7 +75,7 @@ NSHumanReadableCopyright Licensed under GPL version 2 LSMinimumSystemVersion - ${OSX_MIN_VERSION} + ${CMAKE_OSX_DEPLOYMENT_TARGET} LSRequiresCarbon NSHighResolutionCapable