From 3c23a29e2750a11f3b7ebfd22c738eb73d6546c8 Mon Sep 17 00:00:00 2001 From: Mikhail Pozdnyakov Date: Mon, 2 Sep 2019 13:31:53 +0300 Subject: [build] Update mapbox-base version --- cmake/vendor.cmake | 11 ----------- vendor/mapbox-base | 2 +- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/cmake/vendor.cmake b/cmake/vendor.cmake index 23a01dd37c..b996aa2b70 100644 --- a/cmake/vendor.cmake +++ b/cmake/vendor.cmake @@ -24,17 +24,6 @@ if(NOT TARGET mapbox-base) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/vendor/mapbox-base ${CMAKE_BINARY_DIR}/.build-mapbox-gl-native-mapbox-base EXCLUDE_FROM_ALL) endif() -target_compile_definitions(mapbox-base-extras-rapidjson INTERFACE - RAPIDJSON_HAS_STDSTRING=1 -) - -if(WIN32) - target_compile_definitions(mapbox-base-extras-rapidjson INTERFACE - RAPIDJSON_HAS_CXX11_RVALUE_REFS - ) -endif() - - if(MBGL_PLATFORM STREQUAL "linux" OR MBGL_PLATFORM STREQUAL "macos") include(${CMAKE_SOURCE_DIR}/vendor/glfw.cmake) endif() diff --git a/vendor/mapbox-base b/vendor/mapbox-base index 498ee3f41a..7c971e1fc5 160000 --- a/vendor/mapbox-base +++ b/vendor/mapbox-base @@ -1 +1 @@ -Subproject commit 498ee3f41a927a97376e1c9491693e0cc5fe1455 +Subproject commit 7c971e1fc57b2ee34bdf883c67bdf1ac5250d22e -- cgit v1.2.1