diff options
| author | Asheem Mamoowala <asheem.mamoowala@mapbox.com> | 2017-11-16 18:38:27 -0800 |
|---|---|---|
| committer | Asheem Mamoowala <asheem.mamoowala@mapbox.com> | 2017-11-22 13:56:38 -0800 |
| commit | 3067b77c650f5dea0c00a7a92a9fc927e028c742 (patch) | |
| tree | 407bf2b4bf19678f1e7c2418f4fd0b4e18fbfef6 /cmake | |
| parent | ba63d06cfc09b016ce0ddfcaaa297bd259cadf09 (diff) | |
| download | qtlocation-mapboxgl-3067b77c650f5dea0c00a7a92a9fc927e028c742.tar.gz | |
[core, ios, macos] Implement unique_any and remove linb::any
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/core-files.cmake | 2 | ||||
| -rw-r--r-- | cmake/core.cmake | 1 | ||||
| -rw-r--r-- | cmake/filesource.cmake | 1 | ||||
| -rw-r--r-- | cmake/test-files.cmake | 1 | ||||
| -rw-r--r-- | cmake/test.cmake | 1 |
5 files changed, 2 insertions, 4 deletions
diff --git a/cmake/core-files.cmake b/cmake/core-files.cmake index 42c25c8ea9..d6c9493742 100644 --- a/cmake/core-files.cmake +++ b/cmake/core-files.cmake @@ -594,7 +594,6 @@ set(MBGL_CORE_FILES src/mbgl/tile/vector_tile_data.hpp # util - include/mbgl/util/any.hpp include/mbgl/util/async_request.hpp include/mbgl/util/async_task.hpp include/mbgl/util/char_array_buffer.hpp @@ -631,6 +630,7 @@ set(MBGL_CORE_FILES include/mbgl/util/timer.hpp include/mbgl/util/traits.hpp include/mbgl/util/type_list.hpp + include/mbgl/util/unique_any.hpp include/mbgl/util/unitbezier.hpp include/mbgl/util/util.hpp include/mbgl/util/variant.hpp diff --git a/cmake/core.cmake b/cmake/core.cmake index c4e711f558..e1001787fa 100644 --- a/cmake/core.cmake +++ b/cmake/core.cmake @@ -14,7 +14,6 @@ target_include_directories(mbgl-core target_add_mason_package(mbgl-core PUBLIC geometry) target_add_mason_package(mbgl-core PUBLIC variant) -target_add_mason_package(mbgl-core PUBLIC any) target_add_mason_package(mbgl-core PRIVATE unique_resource) target_add_mason_package(mbgl-core PRIVATE rapidjson) target_add_mason_package(mbgl-core PRIVATE boost) diff --git a/cmake/filesource.cmake b/cmake/filesource.cmake index bb1b4e8c05..6251224d44 100644 --- a/cmake/filesource.cmake +++ b/cmake/filesource.cmake @@ -26,7 +26,6 @@ add_library(mbgl-filesource STATIC target_add_mason_package(mbgl-filesource PUBLIC geometry) target_add_mason_package(mbgl-filesource PUBLIC variant) -target_add_mason_package(mbgl-filesource PUBLIC any) target_add_mason_package(mbgl-filesource PRIVATE rapidjson) target_add_mason_package(mbgl-filesource PRIVATE boost) target_add_mason_package(mbgl-filesource PRIVATE geojson) diff --git a/cmake/test-files.cmake b/cmake/test-files.cmake index 43bc1210fd..273852602f 100644 --- a/cmake/test-files.cmake +++ b/cmake/test-files.cmake @@ -147,5 +147,6 @@ set(MBGL_TEST_FILES test/util/tile_cover.test.cpp test/util/timer.test.cpp test/util/token.test.cpp + test/util/unique_any.test.cpp test/util/url.test.cpp ) diff --git a/cmake/test.cmake b/cmake/test.cmake index c821d53316..ab498879e5 100644 --- a/cmake/test.cmake +++ b/cmake/test.cmake @@ -27,7 +27,6 @@ target_link_libraries(mbgl-test target_add_mason_package(mbgl-test PRIVATE geometry) target_add_mason_package(mbgl-test PRIVATE variant) -target_add_mason_package(mbgl-test PRIVATE any) target_add_mason_package(mbgl-test PRIVATE unique_resource) target_add_mason_package(mbgl-test PRIVATE rapidjson) target_add_mason_package(mbgl-test PRIVATE gtest) |