From 1292209508c2ae6293ef6e6b354ec7b2ea9714d0 Mon Sep 17 00:00:00 2001 From: Andrew Plotner Date: Mon, 26 Dec 2022 02:17:52 -0500 Subject: [PATCH] (Again) disable use of libssh2 when building cURL Without this change, we run into the problem where our GHA builder has the libssh2 library installed (and so the built cURL dynamically links to it) but the average mac user does not, leading to the application immediately crashing on start. This was already fixed once before, but with the recent(ish) upgrade to a newer version of cURL than what we'd been using in f1dd6fe, the option CMAKE_USE_LIBSSH2 was renamed to CURL_USE_LIBSSH2, which silently made our forcing of that setting to OFF no longer work. --- extern/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt index 89ca138735..0b23358c9e 100644 --- a/extern/CMakeLists.txt +++ b/extern/CMakeLists.txt @@ -13,7 +13,7 @@ set(BUILD_SHARED_LIBS OFF) # Tell CMake to prefer static libs # External Libraries ## Curl Specific Options -set(CMAKE_USE_LIBSSH2 OFF CACHE BOOL "" FORCE) # Disable curl libssh2 +set(CURL_USE_LIBSSH2 OFF CACHE BOOL "" FORCE) # Disable curl libssh2 set(BUILD_CURL_EXE OFF CACHE BOOL "" FORCE) # Tell curl not to build standalone binary set(BUILD_TESTING OFF CACHE BOOL "" FORCE) # Disable curl testing set(CURL_USE_OPENSSL ON CACHE BOOL "" FORCE) # Require OpenSSL