diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2018-04-29 16:08:16 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2018-05-04 07:19:36 -0700 |
| commit | e423ef5609cd738c07180d11744d4a45ffb3f82f (patch) | |
| tree | 33c1da1b953206769c1fdb2c73ead51c32772070 /cmake | |
| parent | 27b21363e62c105db0b040b4c5a5ef31170ebd30 (diff) | |
| download | qtlocation-mapboxgl-e423ef5609cd738c07180d11744d4a45ffb3f82f.tar.gz | |
[linux] Don't compile linux mbgl-loop-uv against node headers
Previously, `target_include_directories(mbgl-loop-uv PUBLIC ${NODEJS_INCLUDE_DIRS})` always applied. Compiles were working by accident because node is always installed in CI. Instead, split and inline loop-uv.cmake contents: linux uses `target_add_mason_package(mbgl-loop-uv PUBLIC libuv)`, node uses `target_include_directories(mbgl-loop-node PUBLIC ${NODEJS_INCLUDE_DIRS})`.
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/loop-uv.cmake | 18 | ||||
| -rw-r--r-- | cmake/node.cmake | 22 |
2 files changed, 17 insertions, 23 deletions
diff --git a/cmake/loop-uv.cmake b/cmake/loop-uv.cmake deleted file mode 100644 index f4e7ced00e..0000000000 --- a/cmake/loop-uv.cmake +++ /dev/null @@ -1,18 +0,0 @@ -add_library(mbgl-loop-uv STATIC - platform/default/async_task.cpp - platform/default/run_loop.cpp - platform/default/timer.cpp -) - -target_include_directories(mbgl-loop-uv - PRIVATE include - PRIVATE src -) - -target_link_libraries(mbgl-loop-uv - PRIVATE mbgl-core -) - -create_source_groups(mbgl-loop-uv) - -xcode_create_scheme(TARGET mbgl-loop-uv)
\ No newline at end of file diff --git a/cmake/node.cmake b/cmake/node.cmake index 0c2f556b7d..90bec6575c 100644 --- a/cmake/node.cmake +++ b/cmake/node.cmake @@ -2,6 +2,22 @@ include(cmake/NodeJS.cmake) nodejs_init() +add_library(mbgl-loop-node STATIC + platform/default/async_task.cpp + platform/default/run_loop.cpp + platform/default/timer.cpp +) + +target_include_directories(mbgl-loop-node + PRIVATE include + PRIVATE src +) + +target_include_directories(mbgl-loop-node PUBLIC ${NODEJS_INCLUDE_DIRS}) + +create_source_groups(mbgl-loop-node) +xcode_create_scheme(TARGET mbgl-loop-node) + add_nodejs_module(mbgl-node platform/node/src/node_mapbox_gl_native.cpp ) @@ -31,13 +47,9 @@ target_include_directories(mbgl-node 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 + PRIVATE mbgl-loop-node ) target_add_mason_package(mbgl-node PRIVATE geojson) |