From 20bb465047f15a20c91af13553328808081081cd Mon Sep 17 00:00:00 2001
From: PatTheMav <PatTheMav@users.noreply.github.com>
Date: Tue, 15 Dec 2020 17:21:44 +0100
Subject: [PATCH] CI: Fix macOS 10.13 crashes due to unsupported library
 symbols

---
 .github/workflows/main.yml      |  2 +-
 cmake/Modules/FindLibcurl.cmake | 62 +++++++++++++++++++++------------
 2 files changed, 40 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f23845670..7c697dd6c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -24,7 +24,7 @@ jobs:
     runs-on: [macos-latest]
     env:
       MIN_MACOS_VERSION: '10.13'
-      MACOS_DEPS_VERSION: '2020-12-11'
+      MACOS_DEPS_VERSION: '2020-12-19'
       VLC_VERSION: '3.0.8'
       SPARKLE_VERSION: '1.23.0'
       QT_VERSION: '5.15.2'
diff --git a/cmake/Modules/FindLibcurl.cmake b/cmake/Modules/FindLibcurl.cmake
index 5d4906a5e..b4b5a3b88 100644
--- a/cmake/Modules/FindLibcurl.cmake
+++ b/cmake/Modules/FindLibcurl.cmake
@@ -36,29 +36,45 @@ find_path(CURL_INCLUDE_DIR
 	PATH_SUFFIXES
 		include)
 
-find_library(CURL_LIB
-	NAMES ${_CURL_LIBRARIES} curl libcurl
-	HINTS
-		ENV curlPath${_lib_suffix}
-		ENV curlPath
-		ENV DepsPath${_lib_suffix}
-		ENV DepsPath
-		${curlPath${_lib_suffix}}
-		${curlPath}
-		${DepsPath${_lib_suffix}}
-		${DepsPath}
-		${_CURL_LIBRARY_DIRS}
-	PATHS
-		/usr/lib /usr/local/lib /opt/local/lib /sw/lib
-	PATH_SUFFIXES
-		lib${_lib_suffix} lib
-		libs${_lib_suffix} libs
-		bin${_lib_suffix} bin
-		../lib${_lib_suffix} ../lib
-		../libs${_lib_suffix} ../libs
-		../bin${_lib_suffix} ../bin
-		"build/Win${_lib_suffix}/VC12/DLL Release - DLL Windows SSPI"
-		"../build/Win${_lib_suffix}/VC12/DLL Release - DLL Windows SSPI")
+if(APPLE)
+	find_library(CURL_LIB
+		NAMES ${_CURL_LIBRARIES} curl libcurl
+		HINTS
+			ENV curlPath${_lib_suffix}
+			ENV curlPath
+			ENV DepsPath${_lib_suffix}
+			ENV DepsPath
+			${curlPath${_lib_suffix}}
+			${curlPath}
+			${DepsPath${_lib_suffix}}
+			${DepsPath}
+			${_CURL_LIBRARY_DIRS}
+		)
+else()
+	find_library(CURL_LIB
+		NAMES ${_CURL_LIBRARIES} curl libcurl
+		HINTS
+			ENV curlPath${_lib_suffix}
+			ENV curlPath
+			ENV DepsPath${_lib_suffix}
+			ENV DepsPath
+			${curlPath${_lib_suffix}}
+			${curlPath}
+			${DepsPath${_lib_suffix}}
+			${DepsPath}
+			${_CURL_LIBRARY_DIRS}
+		PATHS
+			/usr/lib /usr/local/lib /opt/local/lib /sw/lib
+		PATH_SUFFIXES
+			lib${_lib_suffix} lib
+			libs${_lib_suffix} libs
+			bin${_lib_suffix} bin
+			../lib${_lib_suffix} ../lib
+			../libs${_lib_suffix} ../libs
+			../bin${_lib_suffix} ../bin
+			"build/Win${_lib_suffix}/VC12/DLL Release - DLL Windows SSPI"
+			"../build/Win${_lib_suffix}/VC12/DLL Release - DLL Windows SSPI")
+endif()
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(Libcurl DEFAULT_MSG CURL_LIB CURL_INCLUDE_DIR)