summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorThiago Marcos P. Santos <tmpsantos@gmail.com>2018-11-01 01:31:11 +0200
committerThiago Marcos P. Santos <tmpsantos@gmail.com>2018-11-01 16:29:37 +0200
commitbcbbc7e5f3381482215531abdf005648028f6921 (patch)
tree1162d3e205352b1d760f9f9d92769cbb82e367a2 /cmake
parentca21cedb849e1b6a0071f62bb7139ea7ebbda6d0 (diff)
downloadqtlocation-mapboxgl-bcbbc7e5f3381482215531abdf005648028f6921.tar.gz
[build] Add vendored libboost
Custom extract made using bcp based on 1.65.1
Diffstat (limited to 'cmake')
-rw-r--r--cmake/benchmark.cmake1
-rw-r--r--cmake/core.cmake3
-rw-r--r--cmake/filesource.cmake2
-rw-r--r--cmake/mason-dependencies.cmake1
-rw-r--r--cmake/offline.cmake1
-rw-r--r--cmake/render.cmake1
-rw-r--r--cmake/test.cmake1
-rw-r--r--cmake/vendor.cmake1
8 files changed, 2 insertions, 9 deletions
diff --git a/cmake/benchmark.cmake b/cmake/benchmark.cmake
index a392e1344d..dd47766b9e 100644
--- a/cmake/benchmark.cmake
+++ b/cmake/benchmark.cmake
@@ -13,7 +13,6 @@ target_link_libraries(mbgl-benchmark
PRIVATE mbgl-core
)
-target_add_mason_package(mbgl-benchmark PRIVATE boost)
target_add_mason_package(mbgl-benchmark PRIVATE benchmark)
mbgl_platform_benchmark()
diff --git a/cmake/core.cmake b/cmake/core.cmake
index 04b5f9ea18..c5961cd904 100644
--- a/cmake/core.cmake
+++ b/cmake/core.cmake
@@ -21,6 +21,7 @@ target_link_libraries(mbgl-core PRIVATE
# FIXME: We should not leak these many
# libraries in our public interface.
target_link_libraries(mbgl-core PUBLIC
+ boost
geojson.hpp
geometry.hpp
icu
@@ -32,8 +33,6 @@ target_link_libraries(mbgl-core PUBLIC
vector-tile
)
-target_add_mason_package(mbgl-core PRIVATE boost)
-
mbgl_platform_core()
create_source_groups(mbgl-core)
diff --git a/cmake/filesource.cmake b/cmake/filesource.cmake
index 67926b6d77..5b99170489 100644
--- a/cmake/filesource.cmake
+++ b/cmake/filesource.cmake
@@ -2,8 +2,6 @@
load_sources_list(MBGL_FILESOURCE_FILES cmake/filesource-files.txt)
add_library(mbgl-filesource STATIC ${MBGL_FILESOURCE_FILES})
-target_add_mason_package(mbgl-filesource PRIVATE boost)
-
target_include_directories(mbgl-filesource
PRIVATE include
PRIVATE src
diff --git a/cmake/mason-dependencies.cmake b/cmake/mason-dependencies.cmake
index ea638510d0..b5b1b74075 100644
--- a/cmake/mason-dependencies.cmake
+++ b/cmake/mason-dependencies.cmake
@@ -1,6 +1,5 @@
# All dependencies in a single separate file so its checksum can be used in a CI cache key name
-mason_use(boost VERSION 1.65.1 HEADER_ONLY)
mason_use(cheap-ruler VERSION 2.5.3 HEADER_ONLY)
mason_use(pixelmatch VERSION 0.10.0 HEADER_ONLY)
diff --git a/cmake/offline.cmake b/cmake/offline.cmake
index d1094c33c7..c17ffb2ef3 100644
--- a/cmake/offline.cmake
+++ b/cmake/offline.cmake
@@ -14,7 +14,6 @@ target_link_libraries(mbgl-offline
PRIVATE mbgl-core
)
-target_add_mason_package(mbgl-offline PRIVATE boost)
target_add_mason_package(mbgl-offline PRIVATE args)
mbgl_platform_offline()
diff --git a/cmake/render.cmake b/cmake/render.cmake
index a65cc5bf1c..44912e5302 100644
--- a/cmake/render.cmake
+++ b/cmake/render.cmake
@@ -10,7 +10,6 @@ target_link_libraries(mbgl-render
PRIVATE mbgl-core
)
-target_add_mason_package(mbgl-render PRIVATE boost)
target_add_mason_package(mbgl-render PRIVATE args)
mbgl_platform_render()
diff --git a/cmake/test.cmake b/cmake/test.cmake
index 05cc17c98e..23370bd744 100644
--- a/cmake/test.cmake
+++ b/cmake/test.cmake
@@ -30,7 +30,6 @@ target_link_libraries(mbgl-test PRIVATE
)
target_add_mason_package(mbgl-test PRIVATE pixelmatch)
-target_add_mason_package(mbgl-test PRIVATE boost)
mbgl_platform_test()
diff --git a/cmake/vendor.cmake b/cmake/vendor.cmake
index 1aa522f92c..e66a0cad28 100644
--- a/cmake/vendor.cmake
+++ b/cmake/vendor.cmake
@@ -3,6 +3,7 @@ execute_process(
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/vendor
)
+include(${CMAKE_SOURCE_DIR}/vendor/boost.cmake)
include(${CMAKE_SOURCE_DIR}/vendor/earcut.hpp.cmake)
include(${CMAKE_SOURCE_DIR}/vendor/expected.cmake)
include(${CMAKE_SOURCE_DIR}/vendor/geojson-vt-cpp.cmake)