[build] Cosmetics on vendor packages

- Add include guards on all the files
- Add a vendor package for sqlite and gtest
- Use relative paths to all the files

6 files changed, 19 insertions, 19 deletions

diff --git a/cmake/benchmark.cmake b/cmake/benchmark.cmake
index a944c64d05..7bca681f86 100644
--- a/cmake/benchmark.cmake
+++ b/cmake/benchmark.cmake
@@ -11,7 +11,7 @@ target_include_directories(mbgl-benchmark
 
 target_link_libraries(mbgl-benchmark
     PRIVATE mbgl-core
-    PRIVATE benchmark
+    PRIVATE mbgl-vendor-benchmark
 )
 
 mbgl_platform_benchmark()
diff --git a/cmake/core.cmake b/cmake/core.cmake
index f08ff6bcab..342731de9f 100644
--- a/cmake/core.cmake
+++ b/cmake/core.cmake
@@ -8,31 +8,31 @@ target_include_directories(mbgl-core
 )
 
 target_link_libraries(mbgl-core PRIVATE
-    earcut.hpp
-    eternal
-    expected
-    geojson-vt-cpp
-    shelf-pack-cpp
-    unique_resource
-    wagyu
+    mbgl-vendor-earcut.hpp
+    mbgl-vendor-eternal
+    mbgl-vendor-expected
+    mbgl-vendor-geojson-vt-cpp
+    mbgl-vendor-shelf-pack-cpp
+    mbgl-vendor-unique_resource
+    mbgl-vendor-wagyu
 )
 
 # linux uses ICU from mason, other platforms use vendored ICU
 if(NOT MBGL_PLATFORM STREQUAL "linux")
-    set(ICU_LIBRARY "icu")
+    set(ICU_LIBRARY "mbgl-vendor-icu")
 endif()
 
 # FIXME: We should not leak these many
 # libraries in our public interface.
 target_link_libraries(mbgl-core PUBLIC
-    boost
+    mbgl-vendor-boost
     mapbox-base-extras
     mapbox-base
     ${ICU_LIBRARY}
-    polylabel
-    protozero
+    mbgl-vendor-polylabel
+    mbgl-vendor-protozero
     Mapbox::Base::Extras::rapidjson
-    vector-tile
+    mbgl-vendor-vector-tile
 )
 
 mbgl_platform_core()
diff --git a/cmake/filesource.cmake b/cmake/filesource.cmake
index ff9fa360f6..4d7febdd77 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 expected
+    PUBLIC mbgl-vendor-expected
 )
 
 mbgl_filesource()
diff --git a/cmake/glfw.cmake b/cmake/glfw.cmake
index 6abc93d837..b9ed13af28 100644
--- a/cmake/glfw.cmake
+++ b/cmake/glfw.cmake
@@ -22,7 +22,7 @@ target_include_directories(mbgl-glfw
 target_link_libraries(mbgl-glfw
     PRIVATE mbgl-core
     PRIVATE glfw
-    PRIVATE cheap-ruler-cpp
+    PRIVATE mbgl-vendor-cheap-ruler-cpp
     PRIVATE Mapbox::Base::Extras::args
 )
 
diff --git a/cmake/render-test.cmake b/cmake/render-test.cmake
index 9bc37df808..7369655630 100644
--- a/cmake/render-test.cmake
+++ b/cmake/render-test.cmake
@@ -21,7 +21,7 @@ target_link_libraries(mbgl-render-test PRIVATE
     mbgl-core
     mbgl-filesource
     Mapbox::Base::Extras::args
-    expected
+    mbgl-vendor-expected
     Mapbox::Base::Extras::filesystem
     Mapbox::Base::pixelmatch-cpp
     Mapbox::Base::Extras::rapidjson
diff --git a/cmake/test.cmake b/cmake/test.cmake
index 3cb0ef3a72..405552423c 100644
--- a/cmake/test.cmake
+++ b/cmake/test.cmake
@@ -23,11 +23,11 @@ target_include_directories(mbgl-test
 )
 
 target_link_libraries(mbgl-test PRIVATE
-    googletest
+    mbgl-vendor-googletest
     Mapbox::Base::Extras::args
     mbgl-core
-    shelf-pack-cpp
-    unique_resource
+    mbgl-vendor-shelf-pack-cpp
+    mbgl-vendor-unique_resource
     Mapbox::Base::pixelmatch-cpp
 )