diff options
author | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-08-30 15:14:17 +0300 |
---|---|---|
committer | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-09-02 14:09:08 +0300 |
commit | 805eede8c4c79a9f7cd83f2191697e72793232b0 (patch) | |
tree | f7398e1c35f3c91462afa40aeb87baf68aee72e0 /cmake | |
parent | 4af4081fcfe190c7f10d695cededb35d1ec3b550 (diff) | |
download | qtlocation-mapboxgl-805eede8c4c79a9f7cd83f2191697e72793232b0.tar.gz |
[build] Use args from mapbox-base
Diffstat (limited to 'cmake')
-rw-r--r-- | cmake/glfw.cmake | 2 | ||||
-rw-r--r-- | cmake/offline.cmake | 2 | ||||
-rw-r--r-- | cmake/render-test.cmake | 2 | ||||
-rw-r--r-- | cmake/render.cmake | 2 | ||||
-rw-r--r-- | cmake/test.cmake | 2 | ||||
-rw-r--r-- | cmake/vendor.cmake | 1 |
6 files changed, 5 insertions, 6 deletions
diff --git a/cmake/glfw.cmake b/cmake/glfw.cmake index a4d9c30477..6abc93d837 100644 --- a/cmake/glfw.cmake +++ b/cmake/glfw.cmake @@ -23,7 +23,7 @@ target_link_libraries(mbgl-glfw PRIVATE mbgl-core PRIVATE glfw PRIVATE cheap-ruler-cpp - PRIVATE args + PRIVATE Mapbox::Base::Extras::args ) mbgl_platform_glfw() diff --git a/cmake/offline.cmake b/cmake/offline.cmake index 3fa075f07b..1f5cc60f70 100644 --- a/cmake/offline.cmake +++ b/cmake/offline.cmake @@ -12,7 +12,7 @@ target_include_directories(mbgl-offline target_link_libraries(mbgl-offline PRIVATE mbgl-core - PRIVATE args + PRIVATE Mapbox::Base::Extras::args ) mbgl_platform_offline() diff --git a/cmake/render-test.cmake b/cmake/render-test.cmake index acb8f8bc24..552b90dd0d 100644 --- a/cmake/render-test.cmake +++ b/cmake/render-test.cmake @@ -20,7 +20,7 @@ target_include_directories(mbgl-render-test target_link_libraries(mbgl-render-test PRIVATE mbgl-core mbgl-filesource - args + Mapbox::Base::Extras::args expected filesystem pixelmatch-cpp diff --git a/cmake/render.cmake b/cmake/render.cmake index a625b3f21f..e9c6d89c8e 100644 --- a/cmake/render.cmake +++ b/cmake/render.cmake @@ -8,7 +8,7 @@ target_include_directories(mbgl-render target_link_libraries(mbgl-render PRIVATE mbgl-core - PRIVATE args + PRIVATE Mapbox::Base::Extras::args ) mbgl_platform_render() diff --git a/cmake/test.cmake b/cmake/test.cmake index 1c1d3269a7..13c3ec538b 100644 --- a/cmake/test.cmake +++ b/cmake/test.cmake @@ -24,7 +24,7 @@ target_include_directories(mbgl-test target_link_libraries(mbgl-test PRIVATE googletest - args + Mapbox::Base::Extras::args mbgl-core shelf-pack-cpp unique_resource diff --git a/cmake/vendor.cmake b/cmake/vendor.cmake index 79a90965f3..66fd084dfa 100644 --- a/cmake/vendor.cmake +++ b/cmake/vendor.cmake @@ -22,7 +22,6 @@ include(${CMAKE_SOURCE_DIR}/vendor/shelf-pack-cpp.cmake) include(${CMAKE_SOURCE_DIR}/vendor/unique_resource.cmake) include(${CMAKE_SOURCE_DIR}/vendor/vector-tile.cmake) include(${CMAKE_SOURCE_DIR}/vendor/wagyu.cmake) -include(${CMAKE_SOURCE_DIR}/vendor/args.cmake) if(NOT TARGET mapbox-base) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/vendor/mapbox-base ${CMAKE_BINARY_DIR}/.build-mapbox-gl-native-mapbox-base) |