diff options
| author | Julian Rex <julian.rex@mapbox.com> | 2019-06-14 16:47:48 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-14 16:47:48 -0400 |
| commit | 823670ea35df7d35f68a9d3cb5a42dbc823b66ea (patch) | |
| tree | 7ee89a5069aabbd6ab332d2167cd6d94554a6110 | |
| parent | 9872416c1f6ea9bfa77060deccac17ce0354e561 (diff) | |
| download | qtlocation-mapboxgl-823670ea35df7d35f68a9d3cb5a42dbc823b66ea.tar.gz | |
[ios, macos] Optionally include a developer xcconfig file in generated config.xcconfig file. (#14766)
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | platform/ios/DEVELOPING.md | 4 | ||||
| -rw-r--r-- | platform/macos/DEVELOPING.md | 4 | ||||
| -rw-r--r-- | scripts/config.xcconfig.in | 2 |
4 files changed, 11 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 63499e2b30..e5a7cd9d21 100644 --- a/.gitignore +++ b/.gitignore @@ -23,6 +23,7 @@ xcuserdata /node_modules /platform/ios/benchmark/assets/glyphs/DIN* /platform/ios/benchmark/assets/tiles/mapbox.mapbox-terrain-v2,mapbox.mapbox-streets-v6 +/platform/darwin/developer.xcconfig **/token /platform/macos/macos.xcworkspace/xcshareddata/macos.xcscmblueprint /platform/ios/ios.xcworkspace/xcshareddata/ios.xcscmblueprint diff --git a/platform/ios/DEVELOPING.md b/platform/ios/DEVELOPING.md index 5bf923b15b..d31ceccafa 100644 --- a/platform/ios/DEVELOPING.md +++ b/platform/ios/DEVELOPING.md @@ -140,6 +140,10 @@ To add an example code listing to the documentation for a class or class member: [SourceKitten](https://github.com/jpsim/SourceKitten/) is required and will be installed automatically using Homebrew. +### Customizing compilation settings + +You can provide an optional and custom [`xcconfig`](https://help.apple.com/xcode/mac/current/#/dev745c5c974) file named `platform/darwin/developer.xcconfig` to set custom build options. This file is ignored by git. These custom settings apply to all configurations (`Debug`, `Release`, `RelWithDebInfo`), but do **not** apply to the core `mbgl` files. This mechanism allows you to try different compiler settings (for example when testing an Xcode beta). + ## Testing `make ios-test` builds and runs unit tests of cross-platform code as well as the SDK. diff --git a/platform/macos/DEVELOPING.md b/platform/macos/DEVELOPING.md index 8792a4b974..b9c914a976 100644 --- a/platform/macos/DEVELOPING.md +++ b/platform/macos/DEVELOPING.md @@ -114,6 +114,10 @@ make darwin-update-examples [SourceKitten](https://github.com/jpsim/SourceKitten/) is required and will be installed automatically using Homebrew. +### Customizing compilation settings + +You can provide an optional and custom [`xcconfig`](https://help.apple.com/xcode/mac/current/#/dev745c5c974) file named `platform/darwin/developer.xcconfig` to set custom build options. This file is ignored by git. These custom settings apply to all configurations (`Debug`, `Release`), but do **not** apply to the core `mbgl` files. This mechanism allows you to try different compiler settings (for example when testing an Xcode beta). + ## Testing `make macos-test` builds and runs unit tests of cross-platform code as well as the SDK. diff --git a/scripts/config.xcconfig.in b/scripts/config.xcconfig.in index 69ca2424a1..9370ed0948 100644 --- a/scripts/config.xcconfig.in +++ b/scripts/config.xcconfig.in @@ -7,3 +7,5 @@ mbgl_core_LINK_LIBRARIES = "$<TARGET_PROPERTY:mbgl-core,XCODE_ATTRIBUTE_XCCONFIG // mbgl-filesource mbgl_filesource_INCLUDE_DIRECTORIES = "$<JOIN:$<TARGET_PROPERTY:mbgl-filesource,INTERFACE_INCLUDE_DIRECTORIES>," ">" mbgl_filesource_LINK_LIBRARIES = "$<TARGET_PROPERTY:mbgl-filesource,XCODE_ATTRIBUTE_XCCONFIG_LINK_LIBRARIES>" + +#include? "../../platform/darwin/developer.xcconfig"
\ No newline at end of file |