MirrorRepos/eden
1
0
Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden.git synced 2026-06-06 01:13:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

oops httplib patch

Browse source
This commit is contained in:
lizzie 2026-05-20 18:31:40 +00:00
parent e0d992cf1a
commit 6dad5281d1
2 changed files with 42 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
.patch/httplib/0003-openssl.patch Normal file
View file

@ -0,0 +1,40 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a236839..8d98365 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -188,18 +188,23 @@ set(HTTPLIB_IS_USING_NON_BLOCKING_GETADDRINFO ${HTTPLIB_USE_NON_BLOCKING_GETADDR
# Threads needed for <thread> on some systems, and for <pthread.h> on Linux
set(THREADS_PREFER_PTHREAD_FLAG TRUE)
find_package(Threads REQUIRED)
-# Since Cmake v3.11, Crypto & SSL became optional when not specified as COMPONENTS.
-if(HTTPLIB_REQUIRE_OPENSSL)
- find_package(OpenSSL ${_HTTPLIB_OPENSSL_MIN_VER} COMPONENTS Crypto SSL REQUIRED)
- set(HTTPLIB_IS_USING_OPENSSL TRUE)
-elseif(HTTPLIB_USE_OPENSSL_IF_AVAILABLE)
- find_package(OpenSSL ${_HTTPLIB_OPENSSL_MIN_VER} COMPONENTS Crypto SSL QUIET)
- # Avoid a rare circumstance of not finding all components but the end-user did their
- # own call for OpenSSL, which might trick us into thinking we'd otherwise have what we wanted
- if (TARGET OpenSSL::SSL AND TARGET OpenSSL::Crypto)
- set(HTTPLIB_IS_USING_OPENSSL ${OPENSSL_FOUND})
- else()
- set(HTTPLIB_IS_USING_OPENSSL FALSE)
+
+# Eden top level defines it's own custom target alias for OpenSSL...
+if (NOT TARGET OpenSSL::SSL OR NOT TARGET OpenSSL::Crypto)
+ add_subdirectory(${CMAKE_SOURCE_DIR}/externals/openssl)
+ # Since Cmake v3.11, Crypto & SSL became optional when not specified as COMPONENTS.
+ if(HTTPLIB_REQUIRE_OPENSSL)
+ #find_package(OpenSSL ${_HTTPLIB_OPENSSL_MIN_VER} COMPONENTS Crypto SSL REQUIRED)
+ set(HTTPLIB_IS_USING_OPENSSL TRUE)
+ elseif(HTTPLIB_USE_OPENSSL_IF_AVAILABLE)
+ #find_package(OpenSSL ${_HTTPLIB_OPENSSL_MIN_VER} COMPONENTS Crypto SSL QUIET)
+ # Avoid a rare circumstance of not finding all components but the end-user did their
+ # own call for OpenSSL, which might trick us into thinking we'd otherwise have what we wanted
+ if (TARGET OpenSSL::SSL AND TARGET OpenSSL::Crypto)
+ set(HTTPLIB_IS_USING_OPENSSL ${OPENSSL_FOUND})
+ else()
+ set(HTTPLIB_IS_USING_OPENSSL FALSE)
+ endif()
endif()
endif()

3
externals/cpmfile.json vendored
View file

@ -33,7 +33,8 @@
"find_args": "MODULE GLOBAL",
"patches": [
"0001-mingw.patch",
"0002-fix-zstd.patch"
"0002-fix-zstd.patch",
"0003-openssl.patch"
],
"options": [
"HTTPLIB_REQUIRE_OPENSSL ON",