From 2cdbe934c2df8e4efbadbda5d20eac0d59d24b05 Mon Sep 17 00:00:00 2001 From: Molly Lloyd Date: Wed, 22 Aug 2018 10:57:02 -0700 Subject: [windows, qt] fix windows compiler errors, remove tao + tuple polyfill --- cmake/core-files.txt | 1 - cmake/mason-dependencies.cmake | 1 - 2 files changed, 2 deletions(-) (limited to 'cmake') 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) -- cgit v1.2.1