mirror of
https://github.com/obsproject/obs-studio.git
synced 2024-07-07 03:53:38 +00:00
CI: Fix macOS 10.13 crashes due to unsupported library symbols
This commit is contained in:
parent
6b2830b16f
commit
20bb465047
2
.github/workflows/main.yml
vendored
2
.github/workflows/main.yml
vendored
|
@ -24,7 +24,7 @@ jobs:
|
||||||
runs-on: [macos-latest]
|
runs-on: [macos-latest]
|
||||||
env:
|
env:
|
||||||
MIN_MACOS_VERSION: '10.13'
|
MIN_MACOS_VERSION: '10.13'
|
||||||
MACOS_DEPS_VERSION: '2020-12-11'
|
MACOS_DEPS_VERSION: '2020-12-19'
|
||||||
VLC_VERSION: '3.0.8'
|
VLC_VERSION: '3.0.8'
|
||||||
SPARKLE_VERSION: '1.23.0'
|
SPARKLE_VERSION: '1.23.0'
|
||||||
QT_VERSION: '5.15.2'
|
QT_VERSION: '5.15.2'
|
||||||
|
|
|
@ -36,29 +36,45 @@ find_path(CURL_INCLUDE_DIR
|
||||||
PATH_SUFFIXES
|
PATH_SUFFIXES
|
||||||
include)
|
include)
|
||||||
|
|
||||||
find_library(CURL_LIB
|
if(APPLE)
|
||||||
NAMES ${_CURL_LIBRARIES} curl libcurl
|
find_library(CURL_LIB
|
||||||
HINTS
|
NAMES ${_CURL_LIBRARIES} curl libcurl
|
||||||
ENV curlPath${_lib_suffix}
|
HINTS
|
||||||
ENV curlPath
|
ENV curlPath${_lib_suffix}
|
||||||
ENV DepsPath${_lib_suffix}
|
ENV curlPath
|
||||||
ENV DepsPath
|
ENV DepsPath${_lib_suffix}
|
||||||
${curlPath${_lib_suffix}}
|
ENV DepsPath
|
||||||
${curlPath}
|
${curlPath${_lib_suffix}}
|
||||||
${DepsPath${_lib_suffix}}
|
${curlPath}
|
||||||
${DepsPath}
|
${DepsPath${_lib_suffix}}
|
||||||
${_CURL_LIBRARY_DIRS}
|
${DepsPath}
|
||||||
PATHS
|
${_CURL_LIBRARY_DIRS}
|
||||||
/usr/lib /usr/local/lib /opt/local/lib /sw/lib
|
)
|
||||||
PATH_SUFFIXES
|
else()
|
||||||
lib${_lib_suffix} lib
|
find_library(CURL_LIB
|
||||||
libs${_lib_suffix} libs
|
NAMES ${_CURL_LIBRARIES} curl libcurl
|
||||||
bin${_lib_suffix} bin
|
HINTS
|
||||||
../lib${_lib_suffix} ../lib
|
ENV curlPath${_lib_suffix}
|
||||||
../libs${_lib_suffix} ../libs
|
ENV curlPath
|
||||||
../bin${_lib_suffix} ../bin
|
ENV DepsPath${_lib_suffix}
|
||||||
"build/Win${_lib_suffix}/VC12/DLL Release - DLL Windows SSPI"
|
ENV DepsPath
|
||||||
"../build/Win${_lib_suffix}/VC12/DLL Release - DLL Windows SSPI")
|
${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)
|
include(FindPackageHandleStandardArgs)
|
||||||
find_package_handle_standard_args(Libcurl DEFAULT_MSG CURL_LIB CURL_INCLUDE_DIR)
|
find_package_handle_standard_args(Libcurl DEFAULT_MSG CURL_LIB CURL_INCLUDE_DIR)
|
||||||
|
|
Loading…
Reference in a new issue