diff options
| author | Minh Nguyễn <mxn@1ec5.org> | 2020-04-17 19:09:33 -0700 |
|---|---|---|
| committer | Minh Nguyễn <mxn@1ec5.org> | 2020-04-20 08:14:10 -0700 |
| commit | 9cdca52ec171d5f762b3a6aabe1a52aadfbe624d (patch) | |
| tree | 5948c7499ad20d29b2f39539df818610fa3aaba6 | |
| parent | 71ce52d35f8421c89f6112b83061613937b2836c (diff) | |
| download | qtlocation-mapboxgl-upstream/1ec5-macos-min-deploy-target-16396.tar.gz | |
[macos] Fixed minimum deployment targetupstream/1ec5-macos-min-deploy-target-16396
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | platform/macos/macos.cmake | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index cf6107519c..a03b177f71 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -52,6 +52,8 @@ - [core] Fix segfault resulting from an invalid geometry ([#16409](https://github.com/mapbox/mapbox-gl-native/pull/16409)) +- [macos] Restored support for macOS 10.11–10.14 ([#16412](https://github.com/mapbox/mapbox-gl-native/pull/16412)) + ## maps-v1.5.1 ### 🐞 Bug fixes diff --git a/platform/macos/macos.cmake b/platform/macos/macos.cmake index a0eb3eae55..aa27c31645 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) |