From f30429832e78600b8100a812fb50bcf1b949d567 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= <mail@kkaefer.com>
Date: Tue, 20 Nov 2018 16:45:53 +0100
Subject: [build] use GLFW as a submodule and update to most recent version

this fixes https://github.com/glfw/glfw/issues/1334 for macOS Mojave
---
 cmake/glfw.cmake               | 2 +-
 cmake/mason-dependencies.cmake | 2 --
 cmake/vendor.cmake             | 4 ++++
 3 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'cmake')

diff --git a/cmake/glfw.cmake b/cmake/glfw.cmake
index 4ab4ad9c8d..fe514196d5 100644
--- a/cmake/glfw.cmake
+++ b/cmake/glfw.cmake
@@ -18,10 +18,10 @@ target_include_directories(mbgl-glfw
 
 target_link_libraries(mbgl-glfw
     PRIVATE mbgl-core
+    PRIVATE glfw
     PRIVATE cheap-ruler-cpp
 )
 
-target_add_mason_package(mbgl-glfw PRIVATE glfw)
 target_add_mason_package(mbgl-glfw PRIVATE args)
 
 mbgl_platform_glfw()
diff --git a/cmake/mason-dependencies.cmake b/cmake/mason-dependencies.cmake
index f007ab4c26..71a94f096f 100644
--- a/cmake/mason-dependencies.cmake
+++ b/cmake/mason-dependencies.cmake
@@ -5,7 +5,6 @@ if(MBGL_PLATFORM STREQUAL "android")
 elseif(MBGL_PLATFORM STREQUAL "ios")
     # noop
 elseif(MBGL_PLATFORM STREQUAL "linux")
-    mason_use(glfw VERSION 2018-06-27-0be4f3f)
     mason_use(libuv VERSION 1.9.1)
     mason_use(libpng VERSION 1.6.25)
     mason_use(libjpeg-turbo VERSION 1.5.0)
@@ -15,7 +14,6 @@ elseif(MBGL_PLATFORM STREQUAL "linux")
         mason_use(swiftshader VERSION 2018-05-31)
     endif()
 elseif(MBGL_PLATFORM STREQUAL "macos")
-    mason_use(glfw VERSION 2018-06-27-0be4f3f)
     mason_use(args VERSION 6.2.0 HEADER_ONLY)
 
     if(WITH_EGL)
diff --git a/cmake/vendor.cmake b/cmake/vendor.cmake
index 17128d10ee..557b0062d9 100644
--- a/cmake/vendor.cmake
+++ b/cmake/vendor.cmake
@@ -26,3 +26,7 @@ include(${CMAKE_SOURCE_DIR}/vendor/unique_resource.cmake)
 include(${CMAKE_SOURCE_DIR}/vendor/variant.cmake)
 include(${CMAKE_SOURCE_DIR}/vendor/vector-tile.cmake)
 include(${CMAKE_SOURCE_DIR}/vendor/wagyu.cmake)
+
+if(MBGL_PLATFORM STREQUAL "linux" OR MBGL_PLATFORM STREQUAL "macos")
+    include(${CMAKE_SOURCE_DIR}/vendor/glfw.cmake)
+endif()
-- 
cgit v1.2.1