diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2017-02-21 16:46:49 -0800 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2017-03-28 13:53:19 +0200 |
| commit | 321d820a87b37ecd4656b8c5adf585f2f00e09e2 (patch) | |
| tree | ce76fd1dcdf786ad249f36b7e70e130af1a04563 /cmake/node.cmake | |
| parent | 306b895dadefff7af3deb390fb13e2ea12a3ebc7 (diff) | |
| download | qtlocation-mapboxgl-321d820a87b37ecd4656b8c5adf585f2f00e09e2.tar.gz | |
[node] Eliminate src as an include path
Diffstat (limited to 'cmake/node.cmake')
| -rw-r--r-- | cmake/node.cmake | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/cmake/node.cmake b/cmake/node.cmake index b9a4f68ecc..6833cb983f 100644 --- a/cmake/node.cmake +++ b/cmake/node.cmake @@ -22,12 +22,6 @@ target_sources(mbgl-node 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, - # we don't have to install it manually. - PRIVATE platform/default/async_task.cpp - PRIVATE platform/default/run_loop.cpp - PRIVATE platform/default/timer.cpp ) target_compile_options(mbgl-node @@ -36,12 +30,16 @@ target_compile_options(mbgl-node ) target_include_directories(mbgl-node - PRIVATE src # TODO: eliminate PRIVATE platform/default ) +# Use node-provided uv.h. This is not part of loop-uv.cmake because loop-uv.cmake is also +# used by linux/config.cmake, where we need to use headers provided by mason's libuv. +target_include_directories(mbgl-loop-uv PUBLIC ${NODEJS_INCLUDE_DIRS}) + target_link_libraries(mbgl-node PRIVATE mbgl-core + PRIVATE mbgl-loop-uv ) target_add_mason_package(mbgl-node PRIVATE geojson) |