summaryrefslogtreecommitdiff
path: root/cmake/vendor.cmake
diff options
context:
space:
mode:
authorMikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com>2019-08-30 16:29:13 +0300
committerMikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com>2019-09-02 14:09:08 +0300
commit26ea9798b766e312bb06f4d9f4b7ff99359ad6e1 (patch)
tree590542e6e7e7dc3f44c6bfeaad91cd3c3a82357c /cmake/vendor.cmake
parent02c9918b8399e7a312c31308007b79d322ce7708 (diff)
downloadqtlocation-mapboxgl-26ea9798b766e312bb06f4d9f4b7ff99359ad6e1.tar.gz
[build] Use rapidjson from mapbox-base
Diffstat (limited to 'cmake/vendor.cmake')
-rw-r--r--cmake/vendor.cmake12
1 files changed, 11 insertions, 1 deletions
diff --git a/cmake/vendor.cmake b/cmake/vendor.cmake
index 47f32698bb..6286c0c31c 100644
--- a/cmake/vendor.cmake
+++ b/cmake/vendor.cmake
@@ -15,7 +15,6 @@ include(${CMAKE_SOURCE_DIR}/vendor/icu.cmake)
include(${CMAKE_SOURCE_DIR}/vendor/nunicode.cmake)
include(${CMAKE_SOURCE_DIR}/vendor/polylabel.cmake)
include(${CMAKE_SOURCE_DIR}/vendor/protozero.cmake)
-include(${CMAKE_SOURCE_DIR}/vendor/rapidjson.cmake)
include(${CMAKE_SOURCE_DIR}/vendor/shelf-pack-cpp.cmake)
include(${CMAKE_SOURCE_DIR}/vendor/unique_resource.cmake)
include(${CMAKE_SOURCE_DIR}/vendor/vector-tile.cmake)
@@ -25,6 +24,17 @@ if(NOT TARGET mapbox-base)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/vendor/mapbox-base ${CMAKE_BINARY_DIR}/.build-mapbox-gl-native-mapbox-base)
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()