mirror of
https://git.eden-emu.dev/eden-emu/eden
synced 2026-06-29 00:55:13 +02:00
120 lines
4.9 KiB
Diff
120 lines
4.9 KiB
Diff
From ec4c1fdf526cb9ad045abf59b29ee495bbf5023a Mon Sep 17 00:00:00 2001
|
|
From: crueter <crueter@eden-emu.dev>
|
|
Date: Sat, 30 May 2026 20:56:35 -0400
|
|
Subject: [PATCH] cpmutil compat
|
|
|
|
---
|
|
CMakeLists.txt | 31 ++++++++-----------
|
|
cmake/FetchOpenSSL.cmake | 64 ----------------------------------------
|
|
cmake/GetCPM.cmake | 5 ----
|
|
3 files changed, 13 insertions(+), 87 deletions(-)
|
|
delete mode 100644 cmake/FetchOpenSSL.cmake
|
|
delete mode 100644 cmake/GetCPM.cmake
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 5420ecc..9ffd5a0 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -47,9 +45,6 @@ if("${OPENSSL_TARGET_PLATFORM}" STREQUAL "")
|
|
detect_target_platform(OPENSSL_TARGET_PLATFORM)
|
|
endif()
|
|
|
|
-# Fetch OpenSSL source
|
|
-fetch_openssl()
|
|
-
|
|
# Apply patches
|
|
foreach(patch IN LISTS OPENSSL_PATCH)
|
|
if(EXISTS "${patch}" AND NOT IS_DIRECTORY "${patch}")
|
|
@@ -59,13 +54,13 @@ foreach(patch IN LISTS OPENSSL_PATCH)
|
|
|
|
execute_process(
|
|
COMMAND git init
|
|
- WORKING_DIRECTORY ${openssl_SOURCE_DIR}
|
|
+ WORKING_DIRECTORY ${OpenSSL_SOURCE_DIR}
|
|
OUTPUT_QUIET
|
|
ERROR_QUIET
|
|
)
|
|
execute_process(
|
|
COMMAND git apply ${patch}
|
|
- WORKING_DIRECTORY ${openssl_SOURCE_DIR}
|
|
+ WORKING_DIRECTORY ${OpenSSL_SOURCE_DIR}
|
|
OUTPUT_QUIET
|
|
ERROR_QUIET
|
|
)
|
|
@@ -161,8 +156,8 @@ list(PREPEND OPENSSL_CONFIGURE_OPTIONS ${OPENSSL_TARGET_PLATFORM})
|
|
# Configure OpenSSL
|
|
configure_openssl(
|
|
COMMAND ${VCVARSALL_COMMAND}
|
|
- FILE ${openssl_SOURCE_DIR}/Configure
|
|
- BUILD_DIR ${openssl_BINARY_DIR}
|
|
+ FILE ${OpenSSL_SOURCE_DIR}/Configure
|
|
+ BUILD_DIR ${OpenSSL_BINARY_DIR}
|
|
OPTIONS ${OPENSSL_CONFIGURE_OPTIONS}
|
|
)
|
|
|
|
@@ -203,8 +198,8 @@ endif()
|
|
# Parse Makefile
|
|
parse_makefile(${OPENSSL_MAKEFILE} "INSTALL_LIBS" OPENSSL_STATIC_LIBS)
|
|
parse_makefile(${OPENSSL_MAKEFILE} "INSTALL_SHLIBS" OPENSSL_SHARED_LIBS)
|
|
-list(TRANSFORM OPENSSL_STATIC_LIBS PREPEND "${openssl_BINARY_DIR}/")
|
|
-list(TRANSFORM OPENSSL_SHARED_LIBS PREPEND "${openssl_BINARY_DIR}/")
|
|
+list(TRANSFORM OPENSSL_STATIC_LIBS PREPEND "${OpenSSL_BINARY_DIR}/")
|
|
+list(TRANSFORM OPENSSL_SHARED_LIBS PREPEND "${OpenSSL_BINARY_DIR}/")
|
|
|
|
foreach(LIBRARY IN LISTS OPENSSL_STATIC_LIBS)
|
|
if(LIBRARY MATCHES "crypto")
|
|
@@ -239,14 +234,14 @@ endif()
|
|
|
|
# Provide same targets and variables as FindOpenSSL module
|
|
set(OPENSSL_FOUND ON CACHE BOOL "Override FindOpenSSL variables" FORCE)
|
|
-set(OPENSSL_INCLUDE_DIR ${openssl_SOURCE_DIR}/include ${openssl_BINARY_DIR}/include CACHE STRING "Override FindOpenSSL variables" FORCE)
|
|
+set(OPENSSL_INCLUDE_DIR ${OpenSSL_SOURCE_DIR}/include ${OpenSSL_BINARY_DIR}/include CACHE STRING "Override FindOpenSSL variables" FORCE)
|
|
set(OPENSSL_CRYPTO_LIBRARY ${OPENSSL_${OPENSSL_LIBRARY_TYPE}_CRYPTO_LIBRARY} CACHE STRING "Override FindOpenSSL variables" FORCE)
|
|
set(OPENSSL_CRYPTO_LIBRARIES ${OPENSSL_CRYPTO_LIBRARY} ${OPENSSL_DEPENDENCIES} CACHE STRING "Override FindOpenSSL variables" FORCE)
|
|
set(OPENSSL_SSL_LIBRARY ${OPENSSL_${OPENSSL_LIBRARY_TYPE}_SSL_LIBRARY} CACHE STRING "Override FindOpenSSL variables" FORCE)
|
|
set(OPENSSL_SSL_LIBRARIES ${OPENSSL_SSL_LIBRARY} ${OPENSSL_DEPENDENCIES} CACHE STRING "Override FindOpenSSL variables" FORCE)
|
|
set(OPENSSL_LIBRARIES ${OPENSSL_CRYPTO_LIBRARY} ${OPENSSL_SSL_LIBRARY} ${OPENSSL_DEPENDENCIES} CACHE STRING "Override FindOpenSSL variables" FORCE)
|
|
set(OPENSSL_VERSION ${OPENSSL_CONFIGURED_VERSION} CACHE STRING "Override FindOpenSSL variables" FORCE)
|
|
-set(OPENSSL_APPLINK_SOURCE ${openssl_SOURCE_DIR}/ms/applink.c CACHE STRING "Override FindOpenSSL variables" FORCE)
|
|
+set(OPENSSL_APPLINK_SOURCE ${OpenSSL_SOURCE_DIR}/ms/applink.c CACHE STRING "Override FindOpenSSL variables" FORCE)
|
|
|
|
add_library(OpenSSL::Crypto ${OPENSSL_LIBRARY_TYPE} IMPORTED GLOBAL)
|
|
add_library(OpenSSL::SSL ${OPENSSL_LIBRARY_TYPE} IMPORTED GLOBAL)
|
|
@@ -308,8 +303,8 @@ if(ANDROID)
|
|
endif()
|
|
|
|
file(GLOB_RECURSE OPENSSL_SOURCES
|
|
- ${openssl_SOURCE_DIR}/*.[ch]
|
|
- ${openssl_SOURCE_DIR}/*.[ch].in
|
|
+ ${OpenSSL_SOURCE_DIR}/*.[ch]
|
|
+ ${OpenSSL_SOURCE_DIR}/*.[ch].in
|
|
)
|
|
|
|
set(OPENSSL_BUILD_OUTPUT
|
|
@@ -322,7 +317,7 @@ add_custom_command(
|
|
OUTPUT ${OPENSSL_BUILD_OUTPUT}
|
|
COMMAND ${OPENSSL_BUILD_COMMAND}
|
|
DEPENDS ${OPENSSL_SOURCES}
|
|
- WORKING_DIRECTORY ${openssl_BINARY_DIR}
|
|
+ WORKING_DIRECTORY ${OpenSSL_BINARY_DIR}
|
|
VERBATIM
|
|
)
|
|
|
|
@@ -341,7 +336,7 @@ if(OPENSSL_TEST AND NOT CMAKE_CROSSCOMPILING)
|
|
add_test(
|
|
NAME openssl-test
|
|
COMMAND ${OPENSSL_BUILD_TOOL} test VERBOSE_FAILURE=yes HARNESS_JOBS=${NUMBER_OF_THREADS}
|
|
- WORKING_DIRECTORY ${openssl_BINARY_DIR}
|
|
+ WORKING_DIRECTORY ${OpenSSL_BINARY_DIR}
|
|
)
|
|
endif()
|
|
|
|
@@ -356,7 +351,7 @@ if(OPENSSL_INSTALL)
|
|
install(CODE
|
|
"execute_process(
|
|
COMMAND ${OPENSSL_INSTALL_COMMAND}
|
|
- WORKING_DIRECTORY \"${openssl_BINARY_DIR}\"
|
|
+ WORKING_DIRECTORY \"${OpenSSL_BINARY_DIR}\"
|
|
)"
|
|
)
|
|
endif()
|