From 55e18a6f81f3b8ee61c3eb70b0d1cbe9a861e44f Mon Sep 17 00:00:00 2001
From: Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com>
Date: Thu, 7 Nov 2019 18:31:40 +0200
Subject: [core] Use expected.hpp from mapbox-base

---
 cmake/core.cmake        | 2 +-
 cmake/filesource.cmake  | 2 +-
 cmake/render-test.cmake | 2 +-
 cmake/vendor.cmake      | 1 -
 4 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'cmake')

diff --git a/cmake/core.cmake b/cmake/core.cmake
index 342731de9f..d3b72a5000 100644
--- a/cmake/core.cmake
+++ b/cmake/core.cmake
@@ -10,7 +10,6 @@ target_include_directories(mbgl-core
 target_link_libraries(mbgl-core PRIVATE
     mbgl-vendor-earcut.hpp
     mbgl-vendor-eternal
-    mbgl-vendor-expected
     mbgl-vendor-geojson-vt-cpp
     mbgl-vendor-shelf-pack-cpp
     mbgl-vendor-unique_resource
@@ -32,6 +31,7 @@ target_link_libraries(mbgl-core PUBLIC
     mbgl-vendor-polylabel
     mbgl-vendor-protozero
     Mapbox::Base::Extras::rapidjson
+    Mapbox::Base::Extras::expected-lite
     mbgl-vendor-vector-tile
 )
 
diff --git a/cmake/filesource.cmake b/cmake/filesource.cmake
index 4d7febdd77..aca8b1c962 100644
--- a/cmake/filesource.cmake
+++ b/cmake/filesource.cmake
@@ -10,7 +10,7 @@ target_include_directories(mbgl-filesource
 
 target_link_libraries(mbgl-filesource
     PUBLIC mbgl-core
-    PUBLIC mbgl-vendor-expected
+    PUBLIC Mapbox::Base::Extras::expected-lite
 )
 
 mbgl_filesource()
diff --git a/cmake/render-test.cmake b/cmake/render-test.cmake
index ac17be559c..2b00041dfa 100644
--- a/cmake/render-test.cmake
+++ b/cmake/render-test.cmake
@@ -49,7 +49,7 @@ target_link_libraries(
         mbgl-core
         mbgl-filesource
         Mapbox::Base::Extras::args
-        mbgl-vendor-expected
+        Mapbox::Base::Extras::expected-lite
         Mapbox::Base::Extras::filesystem
         Mapbox::Base::pixelmatch-cpp
         Mapbox::Base::Extras::rapidjson
diff --git a/cmake/vendor.cmake b/cmake/vendor.cmake
index b996aa2b70..e87a2e5c41 100644
--- a/cmake/vendor.cmake
+++ b/cmake/vendor.cmake
@@ -8,7 +8,6 @@ include(${CMAKE_SOURCE_DIR}/vendor/boost.cmake)
 include(${CMAKE_SOURCE_DIR}/vendor/cheap-ruler-cpp.cmake)
 include(${CMAKE_SOURCE_DIR}/vendor/earcut.hpp.cmake)
 include(${CMAKE_SOURCE_DIR}/vendor/eternal.cmake)
-include(${CMAKE_SOURCE_DIR}/vendor/expected.cmake)
 include(${CMAKE_SOURCE_DIR}/vendor/geojson-vt-cpp.cmake)
 include(${CMAKE_SOURCE_DIR}/vendor/googletest.cmake)
 include(${CMAKE_SOURCE_DIR}/vendor/icu.cmake)
-- 
cgit v1.2.1