diff options
| author | Molly Lloyd <molly@mapbox.com> | 2018-08-22 10:57:02 -0700 |
|---|---|---|
| committer | Molly Lloyd <mollymerp@users.noreply.github.com> | 2018-08-31 13:08:47 -0700 |
| commit | 2cdbe934c2df8e4efbadbda5d20eac0d59d24b05 (patch) | |
| tree | 4e8c568dd43e92deee97066a14e776702320768d /cmake | |
| parent | 4a5dc37245d23805d13865f5ef9c5f26e539a9ca (diff) | |
| download | qtlocation-mapboxgl-2cdbe934c2df8e4efbadbda5d20eac0d59d24b05.tar.gz | |
[windows, qt] fix windows compiler errors, remove tao + tuple polyfill
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/core-files.txt | 1 | ||||
| -rw-r--r-- | cmake/mason-dependencies.cmake | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/cmake/core-files.txt b/cmake/core-files.txt index a1e43d2357..d2bc0b96d8 100644 --- a/cmake/core-files.txt +++ b/cmake/core-files.txt @@ -694,7 +694,6 @@ include/mbgl/util/thread.hpp include/mbgl/util/tileset.hpp include/mbgl/util/timer.hpp include/mbgl/util/traits.hpp -include/mbgl/util/tuple.hpp include/mbgl/util/type_list.hpp include/mbgl/util/unitbezier.hpp include/mbgl/util/util.hpp diff --git a/cmake/mason-dependencies.cmake b/cmake/mason-dependencies.cmake index 4a886bef21..f869fe2fdc 100644 --- a/cmake/mason-dependencies.cmake +++ b/cmake/mason-dependencies.cmake @@ -49,7 +49,6 @@ elseif(MBGL_PLATFORM STREQUAL "macos") endif() elseif(MBGL_PLATFORM STREQUAL "qt") mason_use(optional VERSION f27e7908 HEADER_ONLY) - mason_use(tao_tuple VERSION 28626e99 HEADER_ONLY) if(NOT WITH_QT_DECODERS) mason_use(libjpeg-turbo VERSION 1.5.0) |