diff options
| author | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2018-11-16 17:53:17 +0200 |
|---|---|---|
| committer | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2018-11-16 18:58:30 +0200 |
| commit | 9be6c8b1b77f8fc026caee8a09e0cf28e0781253 (patch) | |
| tree | aa642ad3a8c4aa0555581002846cceadbfed4ce9 /cmake | |
| parent | 8757ccddb0d3eb8b271e903244fabe6a21b401a1 (diff) | |
| download | qtlocation-mapboxgl-9be6c8b1b77f8fc026caee8a09e0cf28e0781253.tar.gz | |
[build] Add more vendor packages
* jni.hpp
* cheap-ruler-cpp
* pixelmatch-cpp
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/glfw.cmake | 2 | ||||
| -rw-r--r-- | cmake/mason-dependencies.cmake | 5 | ||||
| -rw-r--r-- | cmake/test.cmake | 3 | ||||
| -rw-r--r-- | cmake/vendor.cmake | 3 |
4 files changed, 6 insertions, 7 deletions
diff --git a/cmake/glfw.cmake b/cmake/glfw.cmake index 7430cac9d2..4ab4ad9c8d 100644 --- a/cmake/glfw.cmake +++ b/cmake/glfw.cmake @@ -18,9 +18,9 @@ target_include_directories(mbgl-glfw target_link_libraries(mbgl-glfw PRIVATE mbgl-core + PRIVATE cheap-ruler-cpp ) -target_add_mason_package(mbgl-glfw PRIVATE cheap-ruler) target_add_mason_package(mbgl-glfw PRIVATE glfw) target_add_mason_package(mbgl-glfw PRIVATE args) diff --git a/cmake/mason-dependencies.cmake b/cmake/mason-dependencies.cmake index 3a7a3f2ef0..f007ab4c26 100644 --- a/cmake/mason-dependencies.cmake +++ b/cmake/mason-dependencies.cmake @@ -1,10 +1,7 @@ # All dependencies in a single separate file so its checksum can be used in a CI cache key name -mason_use(cheap-ruler VERSION 2.5.3 HEADER_ONLY) -mason_use(pixelmatch VERSION 0.10.0 HEADER_ONLY) - if(MBGL_PLATFORM STREQUAL "android") - mason_use(jni.hpp VERSION 4.0.1 HEADER_ONLY) + # noop elseif(MBGL_PLATFORM STREQUAL "ios") # noop elseif(MBGL_PLATFORM STREQUAL "linux") diff --git a/cmake/test.cmake b/cmake/test.cmake index 23370bd744..053ba92d76 100644 --- a/cmake/test.cmake +++ b/cmake/test.cmake @@ -27,10 +27,9 @@ target_link_libraries(mbgl-test PRIVATE mbgl-core shelf-pack-cpp unique_resource + pixelmatch-cpp ) -target_add_mason_package(mbgl-test PRIVATE pixelmatch) - mbgl_platform_test() create_source_groups(mbgl-test) diff --git a/cmake/vendor.cmake b/cmake/vendor.cmake index 760754486e..17128d10ee 100644 --- a/cmake/vendor.cmake +++ b/cmake/vendor.cmake @@ -5,15 +5,18 @@ execute_process( include(${CMAKE_SOURCE_DIR}/vendor/benchmark.cmake) 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/expected.cmake) include(${CMAKE_SOURCE_DIR}/vendor/geojson-vt-cpp.cmake) include(${CMAKE_SOURCE_DIR}/vendor/geojson.hpp.cmake) include(${CMAKE_SOURCE_DIR}/vendor/geometry.hpp.cmake) include(${CMAKE_SOURCE_DIR}/vendor/icu.cmake) +include(${CMAKE_SOURCE_DIR}/vendor/jni.hpp.cmake) include(${CMAKE_SOURCE_DIR}/vendor/kdbush.hpp.cmake) include(${CMAKE_SOURCE_DIR}/vendor/nunicode.cmake) include(${CMAKE_SOURCE_DIR}/vendor/optional.cmake) +include(${CMAKE_SOURCE_DIR}/vendor/pixelmatch-cpp.cmake) include(${CMAKE_SOURCE_DIR}/vendor/polylabel.cmake) include(${CMAKE_SOURCE_DIR}/vendor/protozero.cmake) include(${CMAKE_SOURCE_DIR}/vendor/rapidjson.cmake) |