diff options
author | Mike Morris <mikemorris@users.noreply.github.com> | 2016-10-12 17:28:22 -0400 |
---|---|---|
committer | Mike Morris <mikemorris@users.noreply.github.com> | 2016-10-20 14:37:36 -0400 |
commit | 817c26111a0d6650e7ebae73e46621626106d0a7 (patch) | |
tree | 60a5206f2f7658b06b214d9b7435a65a243d6e83 /cmake | |
parent | ab85fdb4524788ce7279e8ac362a0c1edbd5d5df (diff) | |
download | qtlocation-mapboxgl-817c26111a0d6650e7ebae73e46621626106d0a7.tar.gz |
[core] [node] pass thread pool impl to Map constructor
Updates mbgl::Map constructor usage everywhere
Adds NodeThreadPool implementation using AsyncQueue to call
Nan::AsyncQueueWorker from main thread
Diffstat (limited to 'cmake')
-rw-r--r-- | cmake/core-files.cmake | 2 | ||||
-rw-r--r-- | cmake/node.cmake | 2 | ||||
-rw-r--r-- | cmake/test-files.cmake | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/cmake/core-files.cmake b/cmake/core-files.cmake index 8940899c16..fac5490bb4 100644 --- a/cmake/core-files.cmake +++ b/cmake/core-files.cmake @@ -8,8 +8,6 @@ set(MBGL_CORE_FILES src/mbgl/actor/mailbox.hpp src/mbgl/actor/message.hpp src/mbgl/actor/scheduler.hpp - src/mbgl/actor/thread_pool.cpp - src/mbgl/actor/thread_pool.hpp # algorithm src/mbgl/algorithm/covered_by_children.hpp diff --git a/cmake/node.cmake b/cmake/node.cmake index 75def7c468..8dd95a9419 100644 --- a/cmake/node.cmake +++ b/cmake/node.cmake @@ -11,6 +11,8 @@ target_sources(mbgl-node PRIVATE platform/node/src/node_request.cpp PRIVATE platform/node/src/node_feature.hpp PRIVATE platform/node/src/node_feature.cpp + PRIVATE platform/node/src/node_thread_pool.hpp + PRIVATE platform/node/src/node_thread_pool.cpp PRIVATE platform/node/src/util/async_queue.hpp # We are compiling with the uv loop, but since this target already has the headers for libuv, diff --git a/cmake/test-files.cmake b/cmake/test-files.cmake index 2ade1ba537..598e018224 100644 --- a/cmake/test-files.cmake +++ b/cmake/test-files.cmake @@ -89,9 +89,9 @@ set(MBGL_TEST_FILES # tile test/tile/geometry_tile_data.test.cpp test/tile/raster_tile.test.cpp + test/tile/tile_coordinate.test.cpp test/tile/tile_id.test.cpp test/tile/vector_tile.test.cpp - test/tile/tile_coordinate.test.cpp # util test/util/async_task.test.cpp |