From 321d820a87b37ecd4656b8c5adf585f2f00e09e2 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Tue, 21 Feb 2017 16:46:49 -0800
Subject: [node] Eliminate src as an include path

---
 platform/linux/config.cmake | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'platform/linux')

diff --git a/platform/linux/config.cmake b/platform/linux/config.cmake
index ff2dcf4cfa..97928a0e93 100644
--- a/platform/linux/config.cmake
+++ b/platform/linux/config.cmake
@@ -11,7 +11,9 @@ mason_use(gtest VERSION 1.8.0${MASON_CXXABI_SUFFIX})
 mason_use(benchmark VERSION 1.0.0-1)
 mason_use(icu VERSION 58.1-min-size)
 
-include(cmake/loop-uv.cmake)
+# Link with libuv. This is not part of loop-uv.cmake because loop-uv.cmake is also
+# used by node.cmake, where we want to link with the libuv provided by node itself.
+target_add_mason_package(mbgl-loop-uv PUBLIC libuv)
 
 macro(mbgl_platform_core)
     target_add_mason_package(mbgl-core PUBLIC mesa)
@@ -108,7 +110,7 @@ endmacro()
 
 macro(mbgl_platform_glfw)
     target_link_libraries(mbgl-glfw
-        PRIVATE mbgl-loop
+        PRIVATE mbgl-loop-uv
     )
 
     add_custom_command(
@@ -122,14 +124,14 @@ endmacro()
 
 macro(mbgl_platform_render)
     target_link_libraries(mbgl-render
-        PRIVATE mbgl-loop
+        PRIVATE mbgl-loop-uv
     )
 endmacro()
 
 
 macro(mbgl_platform_offline)
     target_link_libraries(mbgl-offline
-        PRIVATE mbgl-loop
+        PRIVATE mbgl-loop-uv
     )
 endmacro()
 
@@ -146,7 +148,7 @@ macro(mbgl_platform_test)
     )
 
     target_link_libraries(mbgl-test
-        PRIVATE mbgl-loop
+        PRIVATE mbgl-loop-uv
     )
 endmacro()
 
@@ -163,7 +165,7 @@ macro(mbgl_platform_benchmark)
     )
 
     target_link_libraries(mbgl-benchmark
-        PRIVATE mbgl-loop
+        PRIVATE mbgl-loop-uv
     )
 endmacro()
 
-- 
cgit v1.2.1