From 15dcdc7318b10840045d4604f9dd365b51616308 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20Nguy=E1=BB=85n?= Date: Fri, 17 Apr 2020 19:09:33 -0700 Subject: [macos] Fixed minimum deployment target Cherry-picked from af048481b1fa07c56997e256e35c639ae68ad9cf. --- CHANGELOG.md | 4 +++- platform/macos/macos.cmake | 4 +--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9cf0f59b90..c725bb4635 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # Changelog -## master +## maps-v1.5.2 + +- [macos] Restored support for macOS 10.11–10.14 ([#16412](https://github.com/mapbox/mapbox-gl-native/pull/16412)) ## maps-v1.5.1 diff --git a/platform/macos/macos.cmake b/platform/macos/macos.cmake index 3e23b8d5be..90784e8b16 100644 --- a/platform/macos/macos.cmake +++ b/platform/macos/macos.cmake @@ -1,6 +1,4 @@ -if(NOT DEFINED MACOSX_DEPLOYMENT_TARGET) - set(MACOSX_DEPLOYMENT_TARGET "10.11") -endif() +set(CMAKE_OSX_DEPLOYMENT_TARGET "10.11") set_target_properties(mbgl-core PROPERTIES XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC YES) -- cgit v1.2.1