Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

minor docs updates #5879

Merged
merged 3 commits into from
Aug 16, 2016
Merged

minor docs updates #5879

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3dc4517
[ios] fix circular class reference
incanus Aug 5, 2016
c5f330b
add CMake to global build dependencies
incanus Aug 5, 2016
74b70bc
[core] #5879 - CMake 3.1 or later note
bleege Aug 16, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .mason
Open in desktop
Submodule .mason updated 6 files
+4 −1 mason.cmake
+6 −8 mason.sh
+0 −25 scripts/boost_libregex_icu/1.61.0/.travis.yml
+0 −58 scripts/boost_libregex_icu/1.61.0/script.sh
+0 −26 scripts/osmium-tool/1.3.1/.travis.yml
+0 −63 scripts/osmium-tool/1.3.1/script.sh
2 changes: 1 addition & 1 deletion INSTALL.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ targets.
- Modern C++ compiler that supports `-std=c++14`
- clang++ 3.5 or later _or_
- g++-5 or later
- [CMake](https://cmake.org/) (for build only)
- [CMake](https://cmake.org/) 3.1 or later (for build only)
- [cURL](https://curl.haxx.se) (for build only)
- [Node.js](https://nodejs.org/) (for build only)
- [`pkg-config`](https://wiki.freedesktop.org/www/Software/pkg-config/) (for build only)
Copy link
Contributor

@mikemorris mikemorris Aug 8, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It appears that we're no longer using pkg-config either? Oops, looks like we're using it indirectly via find_package in CMake now

I was previously using this to ensure we were compiling and linking against a mason-installed version of Mesa, ran into trouble rebasing 04fc3cb onto master because now it can't find EGL/egl.h (which it previously found through pkg-config --cflags)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We are not using find_package in CMake. However, we are using it indirectly because we are invoking mason (which could call pkg-config based on the script.sh) when there is no mason.ini file yet in the package. As we move on and more of the packages we use contain a mason.ini in the precompiled tarball download, we can remove the on-demand mason.ini creation, which removes the pkg-config requirement for Mapbox GL Native.

For what it's worth, we only require Python for creating the shader files and version headers, but we can easily move this to node.js, which we require anyway because of our use of npm.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

created ticket for Python removal: #6010

Expand Down
2 changes: 1 addition & 1 deletion platform/darwin/src/MGLCompassDirectionFormatter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ NS_ASSUME_NONNULL_BEGIN

Use this class to create localized heading strings when displaying directions
irrespective of the user’s current location. To format a direction relative to
the user’s current location, use `MGLCompassDirectionFormatter` instead.
the user’s current location, use `MGLClockDirectionFormatter` instead.
*/
@interface MGLCompassDirectionFormatter : NSFormatter

Expand Down