[cmake] fix windows build, explicit shared lib settings
All checks were successful
eden-license / license-header (pull_request) Successful in 26s

Signed-off-by: crueter <crueter@crueter.xyz>
This commit is contained in:
crueter 2025-08-19 14:19:34 -04:00
parent 0bcb3144eb
commit d7319a3da2
Signed by: crueter
GPG key ID: 425ACD2D4830EBC6
3 changed files with 11 additions and 4 deletions

View file

@ -400,6 +400,7 @@ if (YUZU_USE_CPM)
if (MSVC AND ARCHITECTURE_x86_64) if (MSVC AND ARCHITECTURE_x86_64)
set(DOWNLOAD_ONLY OFF) set(DOWNLOAD_ONLY OFF)
set(BUILD_SHARED_LIBS OFF)
else() else()
set(DOWNLOAD_ONLY ON) set(DOWNLOAD_ONLY ON)
endif() endif()
@ -420,6 +421,8 @@ if (YUZU_USE_CPM)
if (NOT DOWNLOAD_ONLY) if (NOT DOWNLOAD_ONLY)
set(OPENSSL_DIR ${OpenSSL-windows-amd64_SOURCE_DIR}) set(OPENSSL_DIR ${OpenSSL-windows-amd64_SOURCE_DIR})
endif() endif()
message("OPENSSL ${DOWNLOAD_ONLY} ${OPENSSL_DIR}")
endif() endif()
if ((MSVC AND ARCHITECTURE_arm64) OR FORCE_DOWNLOAD_OPENSSL) if ((MSVC AND ARCHITECTURE_arm64) OR FORCE_DOWNLOAD_OPENSSL)
@ -428,6 +431,7 @@ if (YUZU_USE_CPM)
if (MSVC AND ARCHITECTURE_arm64) if (MSVC AND ARCHITECTURE_arm64)
set(DOWNLOAD_ONLY OFF) set(DOWNLOAD_ONLY OFF)
set(BUILD_SHARED_LIBS OFF)
else() else()
set(DOWNLOAD_ONLY ON) set(DOWNLOAD_ONLY ON)
endif() endif()
@ -453,6 +457,7 @@ if (YUZU_USE_CPM)
if (ANDROID OR FORCE_DOWNLOAD_OPENSSL) if (ANDROID OR FORCE_DOWNLOAD_OPENSSL)
if (ANDROID) if (ANDROID)
set(DOWNLOAD_ONLY OFF) set(DOWNLOAD_ONLY OFF)
set(BUILD_SHARED_LIBS OFF)
else() else()
set(DOWNLOAD_ONLY ON) set(DOWNLOAD_ONLY ON)
endif() endif()
@ -478,6 +483,7 @@ if (YUZU_USE_CPM)
if(PLATFORM_SUN OR FORCE_DOWNLOAD_OPENSSL) if(PLATFORM_SUN OR FORCE_DOWNLOAD_OPENSSL)
if (PLATFORM_SUN) if (PLATFORM_SUN)
set(DOWNLOAD_ONLY OFF) set(DOWNLOAD_ONLY OFF)
set(BUILD_SHARED_LIBS OFF)
else() else()
set(DOWNLOAD_ONLY ON) set(DOWNLOAD_ONLY ON)
endif() endif()
@ -503,6 +509,7 @@ if (YUZU_USE_CPM)
if(PLATFORM_FREEBSD OR FORCE_DOWNLOAD_OPENSSL) if(PLATFORM_FREEBSD OR FORCE_DOWNLOAD_OPENSSL)
if (PLATFORM_FREEBSD) if (PLATFORM_FREEBSD)
set(DOWNLOAD_ONLY OFF) set(DOWNLOAD_ONLY OFF)
set(BUILD_SHARED_LIBS OFF)
else() else()
set(DOWNLOAD_ONLY ON) set(DOWNLOAD_ONLY ON)
endif() endif()
@ -528,6 +535,7 @@ if (YUZU_USE_CPM)
if(PLATFORM_LINUX OR FORCE_DOWNLOAD_OPENSSL) if(PLATFORM_LINUX OR FORCE_DOWNLOAD_OPENSSL)
if (PLATFORM_LINUX) if (PLATFORM_LINUX)
set(DOWNLOAD_ONLY OFF) set(DOWNLOAD_ONLY OFF)
set(BUILD_SHARED_LIBS OFF)
else() else()
set(DOWNLOAD_ONLY ON) set(DOWNLOAD_ONLY ON)
endif() endif()
@ -552,7 +560,6 @@ if (YUZU_USE_CPM)
if (DEFINED OPENSSL_DIR) if (DEFINED OPENSSL_DIR)
include(${OPENSSL_DIR}/openssl.cmake) include(${OPENSSL_DIR}/openssl.cmake)
set(OpenSSL_ADDED ON)
# Overrides find package # Overrides find package
CPMAddPackage( CPMAddPackage(
@ -561,7 +568,6 @@ if (YUZU_USE_CPM)
) )
else() else()
find_package(OpenSSL 1.1.1 REQUIRED) find_package(OpenSSL 1.1.1 REQUIRED)
set(OpenSSL_ADDED OFF)
endif() endif()
endif() endif()

View file

@ -1249,10 +1249,11 @@ if(ENABLE_OPENSSL)
target_sources(core PRIVATE target_sources(core PRIVATE
hle/service/ssl/ssl_backend_openssl.cpp) hle/service/ssl/ssl_backend_openssl.cpp)
find_package(OpenSSL REQUIRED)
if (OpenSSL_ADDED) if (OpenSSL_ADDED)
link_openssl(core) link_openssl(core)
else() else()
find_package(OpenSSL REQUIRED)
target_link_libraries(core PRIVATE OpenSSL::SSL) target_link_libraries(core PRIVATE OpenSSL::SSL)
endif() endif()
elseif (APPLE) elseif (APPLE)

View file

@ -105,7 +105,7 @@ inline size_t RegNumber(ExtReg reg) {
return static_cast<size_t>(reg) - static_cast<size_t>(ExtReg::Q0); return static_cast<size_t>(reg) - static_cast<size_t>(ExtReg::Q0);
} }
ASSERT_FALSE("Invalid extended register"); ASSERT_MSG(false, "Invalid extended register");
} }
inline Reg operator+(Reg reg, size_t number) { inline Reg operator+(Reg reg, size_t number) {