From 55e18a6f81f3b8ee61c3eb70b0d1cbe9a861e44f Mon Sep 17 00:00:00 2001 From: Mikhail Pozdnyakov Date: Thu, 7 Nov 2019 18:31:40 +0200 Subject: [core] Use expected.hpp from mapbox-base --- next/CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'next') 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) -- cgit v1.2.1