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-24 18:44:17 -0700 |
| commit | 15dcdc7318b10840045d4604f9dd365b51616308 (patch) | |
| tree | 6118b5c33c52188e95eb37acd47fd29d816abf75 | |
| parent | 77b883d80d2dee6612e0e3621c32b90adbd85e3e (diff) | |
| download | qtlocation-mapboxgl-15dcdc7318b10840045d4604f9dd365b51616308.tar.gz | |
[macos] Fixed minimum deployment target
Cherry-picked from af048481b1fa07c56997e256e35c639ae68ad9cf.
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | 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) |