diff options
author | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-11-07 18:31:40 +0200 |
---|---|---|
committer | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-11-08 11:27:30 +0200 |
commit | 55e18a6f81f3b8ee61c3eb70b0d1cbe9a861e44f (patch) | |
tree | b3dc2862462189e266ddedbb01c2ad8101b07fa9 /next | |
parent | 2e8a350d68be75d9505fab9dc897c4abbcae05aa (diff) | |
download | qtlocation-mapboxgl-55e18a6f81f3b8ee61c3eb70b0d1cbe9a861e44f.tar.gz |
[core] Use expected.hpp from mapbox-base
Diffstat (limited to 'next')
-rw-r--r-- | next/CMakeLists.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/next/CMakeLists.txt b/next/CMakeLists.txt index 924761ad85..aa26e3a572 100644 --- a/next/CMakeLists.txt +++ b/next/CMakeLists.txt @@ -890,7 +890,6 @@ endif(NOT TARGET mapbox-base) include(${PROJECT_SOURCE_DIR}/vendor/boost.cmake) include(${PROJECT_SOURCE_DIR}/vendor/earcut.hpp.cmake) include(${PROJECT_SOURCE_DIR}/vendor/eternal.cmake) -include(${PROJECT_SOURCE_DIR}/vendor/expected.cmake) include(${PROJECT_SOURCE_DIR}/vendor/geojson-vt-cpp.cmake) include(${PROJECT_SOURCE_DIR}/vendor/polylabel.cmake) include(${PROJECT_SOURCE_DIR}/vendor/protozero.cmake) @@ -915,6 +914,7 @@ target_link_libraries( mbgl-vendor-vector-tile mbgl-vendor-wagyu PUBLIC + Mapbox::Base::Extras::expected-lite Mapbox::Base::Extras::rapidjson Mapbox::Base::geojson.hpp Mapbox::Base::geometry.hpp @@ -923,7 +923,6 @@ target_link_libraries( Mapbox::Base::value Mapbox::Base::variant Mapbox::Base::weak - mbgl-vendor-expected ) set_property(TARGET mbgl-core PROPERTY FOLDER Core) |