summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorMikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com>2019-08-30 13:15:28 +0300
committerMikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com>2019-09-02 14:09:08 +0300
commitd4ef66c7b06d00295a54d48646a6ef4be03d9c4f (patch)
treed7107da0b6436f81f0232a8d572a4a662592a044 /cmake
parent0c0b82dc27cbe15cc902ce2c1dac00d77eccc03c (diff)
downloadqtlocation-mapboxgl-d4ef66c7b06d00295a54d48646a6ef4be03d9c4f.tar.gz
[build] Use kdbush.hpp from mapbox-base
Diffstat (limited to 'cmake')
-rw-r--r--cmake/core.cmake2
-rw-r--r--cmake/vendor.cmake1
2 files changed, 1 insertions, 2 deletions
diff --git a/cmake/core.cmake b/cmake/core.cmake
index d752607068..223c479e7f 100644
--- a/cmake/core.cmake
+++ b/cmake/core.cmake
@@ -12,7 +12,6 @@ target_link_libraries(mbgl-core PRIVATE
eternal
expected
geojson-vt-cpp
- kdbush.hpp
shelf-pack-cpp
unique_resource
wagyu
@@ -27,6 +26,7 @@ endif()
# libraries in our public interface.
target_link_libraries(mbgl-core PUBLIC
boost
+ mapbox-base-extras
mapbox-base
geojson.hpp
${ICU_LIBRARY}
diff --git a/cmake/vendor.cmake b/cmake/vendor.cmake
index 904516f664..2932bcf094 100644
--- a/cmake/vendor.cmake
+++ b/cmake/vendor.cmake
@@ -15,7 +15,6 @@ include(${CMAKE_SOURCE_DIR}/vendor/geojson.hpp.cmake)
include(${CMAKE_SOURCE_DIR}/vendor/googletest.cmake)
include(${CMAKE_SOURCE_DIR}/vendor/icu.cmake)
include(${CMAKE_SOURCE_DIR}/vendor/jni.hpp.cmake)
-include(${CMAKE_SOURCE_DIR}/vendor/kdbush.hpp.cmake)
include(${CMAKE_SOURCE_DIR}/vendor/nunicode.cmake)
include(${CMAKE_SOURCE_DIR}/vendor/pixelmatch-cpp.cmake)
include(${CMAKE_SOURCE_DIR}/vendor/polylabel.cmake)