diff options
| author | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-09-02 13:31:53 +0300 |
|---|---|---|
| committer | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-09-02 14:09:08 +0300 |
| commit | 3c23a29e2750a11f3b7ebfd22c738eb73d6546c8 (patch) | |
| tree | f51a78ed7b4570b9e10731036d81c91448a7aa41 | |
| parent | d1c87d2cb0a0444ad2b83ed39bec1cd1b2066d73 (diff) | |
| download | qtlocation-mapboxgl-3c23a29e2750a11f3b7ebfd22c738eb73d6546c8.tar.gz | |
[build] Update mapbox-base version
| -rw-r--r-- | cmake/vendor.cmake | 11 | ||||
| m--------- | vendor/mapbox-base | 0 |
2 files changed, 0 insertions, 11 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 -Subproject 498ee3f41a927a97376e1c9491693e0cc5fe145 +Subproject 7c971e1fc57b2ee34bdf883c67bdf1ac5250d22 |