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 /platform/macos | |
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 'platform/macos')
-rw-r--r-- | platform/macos/config.cmake | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/platform/macos/config.cmake b/platform/macos/config.cmake index e929bb55c6..28573258d9 100644 --- a/platform/macos/config.cmake +++ b/platform/macos/config.cmake @@ -6,7 +6,6 @@ mason_use(benchmark VERSION 1.2.0) mason_use(icu VERSION 58.1-min-size) mason_use(args VERSION 6.2.0 HEADER_ONLY) -include(cmake/loop-uv.cmake) include(cmake/loop-darwin.cmake) macro(mbgl_platform_core) |