[build] Add vendored libboost

Custom extract made using bcp based on 1.65.1
This commit is contained in:
Thiago Marcos P. Santos
2018-11-01 01:31:11 +02:00
parent ca21cedb84
commit bcbbc7e5f3
11 changed files with 11 additions and 9 deletions

3
.gitmodules vendored
View File

@@ -58,3 +58,6 @@
[submodule "vendor/optional"]
path = vendor/optional
url = https://github.com/mapbox/Optional.git
[submodule "vendor/boost"]
path = vendor/boost
url = https://github.com/mapbox/mapbox-gl-native-boost.git

View File

@@ -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()

View File

@@ -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)

View File

@@ -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

View File

@@ -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)

View File

@@ -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()

View File

@@ -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()

View File

@@ -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()

View File

@@ -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)

1
vendor/boost vendored Submodule

Submodule vendor/boost added at e841ea9b8f

5
vendor/boost.cmake vendored Normal file
View File

@@ -0,0 +1,5 @@
add_library(boost INTERFACE)
target_include_directories(boost SYSTEM INTERFACE
${CMAKE_SOURCE_DIR}/vendor/boost/include
)