diff options
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/core.cmake | 3 | ||||
| -rw-r--r-- | cmake/vendor.cmake | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/cmake/core.cmake b/cmake/core.cmake index 3278c4f7d3..7f70f65557 100644 --- a/cmake/core.cmake +++ b/cmake/core.cmake @@ -28,14 +28,13 @@ endif() # libraries in our public interface. target_link_libraries(mbgl-core PUBLIC boost + mapbox-base geojson.hpp - geometry.hpp ${ICU_LIBRARY} optional polylabel protozero rapidjson - variant vector-tile ) diff --git a/cmake/vendor.cmake b/cmake/vendor.cmake index bc1bad757f..a59c5921b3 100644 --- a/cmake/vendor.cmake +++ b/cmake/vendor.cmake @@ -12,7 +12,6 @@ include(${CMAKE_SOURCE_DIR}/vendor/expected.cmake) include(${CMAKE_SOURCE_DIR}/vendor/filesystem.cmake) include(${CMAKE_SOURCE_DIR}/vendor/geojson-vt-cpp.cmake) include(${CMAKE_SOURCE_DIR}/vendor/geojson.hpp.cmake) -include(${CMAKE_SOURCE_DIR}/vendor/geometry.hpp.cmake) include(${CMAKE_SOURCE_DIR}/vendor/icu.cmake) include(${CMAKE_SOURCE_DIR}/vendor/jni.hpp.cmake) include(${CMAKE_SOURCE_DIR}/vendor/kdbush.hpp.cmake) @@ -25,11 +24,12 @@ include(${CMAKE_SOURCE_DIR}/vendor/rapidjson.cmake) include(${CMAKE_SOURCE_DIR}/vendor/shelf-pack-cpp.cmake) include(${CMAKE_SOURCE_DIR}/vendor/supercluster.hpp.cmake) include(${CMAKE_SOURCE_DIR}/vendor/unique_resource.cmake) -include(${CMAKE_SOURCE_DIR}/vendor/variant.cmake) include(${CMAKE_SOURCE_DIR}/vendor/vector-tile.cmake) include(${CMAKE_SOURCE_DIR}/vendor/wagyu.cmake) include(${CMAKE_SOURCE_DIR}/vendor/args.cmake) +add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/vendor/mapbox-base) + if(MBGL_PLATFORM STREQUAL "linux" OR MBGL_PLATFORM STREQUAL "macos") include(${CMAKE_SOURCE_DIR}/vendor/glfw.cmake) endif() |