diff options
Diffstat (limited to 'cmake/vendor.cmake')
| -rw-r--r-- | cmake/vendor.cmake | 12 |
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() |