From c27fceb7de94d908ba9fbf56a6edb6f07f614e44 Mon Sep 17 00:00:00 2001 From: Czarek Tomczak Date: Sun, 31 May 2020 14:27:31 +0200 Subject: [PATCH] MacOS: Update target SDK to 10.10 for cmake and tests --- cmake/cef_variables.cmake.in | 4 ++-- tests/cefclient/resources/mac/Info.plist | 2 +- tests/cefclient/resources/mac/helper-Info.plist | 2 +- tests/cefsimple/mac/Info.plist | 2 +- tests/cefsimple/mac/helper-Info.plist | 2 +- tests/ceftests/resources/mac/Info.plist | 4 ++++ tests/ceftests/resources/mac/helper-Info.plist | 2 +- 7 files changed, 11 insertions(+), 7 deletions(-) diff --git a/cmake/cef_variables.cmake.in b/cmake/cef_variables.cmake.in index 4b3b58de8..adc78e94e 100644 --- a/cmake/cef_variables.cmake.in +++ b/cmake/cef_variables.cmake.in @@ -310,7 +310,7 @@ if(OS_MACOSX) # Find the newest available base SDK. execute_process(COMMAND xcode-select --print-path OUTPUT_VARIABLE XCODE_PATH OUTPUT_STRIP_TRAILING_WHITESPACE) - foreach(OS_VERSION 10.11 10.10 10.9) + foreach(OS_VERSION 10.15 10.14 10.13 10.12 10.11 10.10) set(SDK "${XCODE_PATH}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX${OS_VERSION}.sdk") if(NOT "${CMAKE_OSX_SYSROOT}" AND EXISTS "${SDK}" AND IS_DIRECTORY "${SDK}") set(CMAKE_OSX_SYSROOT ${SDK}) @@ -318,7 +318,7 @@ if(OS_MACOSX) endforeach() # Target SDK. - set(CEF_TARGET_SDK "10.9") + set(CEF_TARGET_SDK "10.10") list(APPEND CEF_COMPILER_FLAGS -mmacosx-version-min=${CEF_TARGET_SDK} ) diff --git a/tests/cefclient/resources/mac/Info.plist b/tests/cefclient/resources/mac/Info.plist index 3730aeb48..0736db724 100644 --- a/tests/cefclient/resources/mac/Info.plist +++ b/tests/cefclient/resources/mac/Info.plist @@ -28,7 +28,7 @@ 0 LSMinimumSystemVersion - 10.9.0 + 10.10.0 NSMainNibFile MainMenu NSPrincipalClass diff --git a/tests/cefclient/resources/mac/helper-Info.plist b/tests/cefclient/resources/mac/helper-Info.plist index 43fb55615..f851bac80 100644 --- a/tests/cefclient/resources/mac/helper-Info.plist +++ b/tests/cefclient/resources/mac/helper-Info.plist @@ -28,7 +28,7 @@ LSFileQuarantineEnabled LSMinimumSystemVersion - 10.9.0 + 10.10.0 LSUIElement 1 NSSupportsAutomaticGraphicsSwitching diff --git a/tests/cefsimple/mac/Info.plist b/tests/cefsimple/mac/Info.plist index 102c9b5e8..7f1bf5c91 100644 --- a/tests/cefsimple/mac/Info.plist +++ b/tests/cefsimple/mac/Info.plist @@ -26,7 +26,7 @@ 0 LSMinimumSystemVersion - 10.9.0 + 10.10.0 NSMainNibFile MainMenu NSPrincipalClass diff --git a/tests/cefsimple/mac/helper-Info.plist b/tests/cefsimple/mac/helper-Info.plist index 46c1e2b90..237bb0bd5 100644 --- a/tests/cefsimple/mac/helper-Info.plist +++ b/tests/cefsimple/mac/helper-Info.plist @@ -26,7 +26,7 @@ LSFileQuarantineEnabled LSMinimumSystemVersion - 10.9.0 + 10.10.0 LSUIElement 1 NSSupportsAutomaticGraphicsSwitching diff --git a/tests/ceftests/resources/mac/Info.plist b/tests/ceftests/resources/mac/Info.plist index 18c373bcf..ff906ed70 100644 --- a/tests/ceftests/resources/mac/Info.plist +++ b/tests/ceftests/resources/mac/Info.plist @@ -25,9 +25,13 @@ MallocNanoZone 0 + LSMinimumSystemVersion + 10.10.0 NSMainNibFile MainMenu NSPrincipalClass NSApplication + NSSupportsAutomaticGraphicsSwitching + diff --git a/tests/ceftests/resources/mac/helper-Info.plist b/tests/ceftests/resources/mac/helper-Info.plist index d2359ccba..58e41dfc8 100644 --- a/tests/ceftests/resources/mac/helper-Info.plist +++ b/tests/ceftests/resources/mac/helper-Info.plist @@ -26,7 +26,7 @@ LSFileQuarantineEnabled LSMinimumSystemVersion - 10.9.0 + 10.10.0 LSUIElement 1 NSSupportsAutomaticGraphicsSwitching