diff options
| author | Ivo van Dongen <info@ivovandongen.nl> | 2017-08-08 16:16:42 +0300 |
|---|---|---|
| committer | Ivo van Dongen <info@ivovandongen.nl> | 2017-08-09 12:13:00 +0300 |
| commit | 66ce50d4c33a16d6c7dee3254f89373a543b77b0 (patch) | |
| tree | 674a1e9924258925e783e778debee89dc170191c | |
| parent | cd2b29a2ce5554911fc3a0f0b02b4aa88c25b28e (diff) | |
| download | qtlocation-mapboxgl-66ce50d4c33a16d6c7dee3254f89373a543b77b0.tar.gz | |
[node] include platform files directly instead of using a intermediate static library
| -rw-r--r-- | cmake/node.cmake | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/cmake/node.cmake b/cmake/node.cmake index 502edd8293..a5c450eae7 100644 --- a/cmake/node.cmake +++ b/cmake/node.cmake @@ -11,6 +11,9 @@ add_nodejs_module(mbgl-node set_target_properties("mbgl-node" PROPERTIES CXX_STANDARD 14) target_sources(mbgl-node + PRIVATE platform/default/async_task.cpp + PRIVATE platform/default/run_loop.cpp + PRIVATE platform/default/timer.cpp PRIVATE platform/node/src/node_logging.hpp PRIVATE platform/node/src/node_logging.cpp PRIVATE platform/node/src/node_map.hpp @@ -30,16 +33,16 @@ target_compile_options(mbgl-node ) target_include_directories(mbgl-node + PRIVATE include + PRIVATE src 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. +# Use node-provided uv.h 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) |