eden-emu/eden
24
3
Fork 15
Code Issues 138 Pull requests 56 Projects 1 Releases Packages Wiki Activity Actions

[cmake] refactor: SDL2 CI and CPMUtil::AddCIPackage #284

Merged
Shinmegumi merged 13 commits from feature/sdl2-ci into master 2025-08-23 19:42:50 +02:00
Conversation 4 Commits 13 Files changed 10 +9 -14
5 changed files with 9 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 97a11fc8dc - Show all commits

5
CMakeLists.txt
View file

@ -690,7 +690,10 @@ if (ENABLE_SDL2)
elseif (YUZU_USE_EXTERNAL_SDL2)
message(STATUS "Using SDL2 from externals.")
endif()
find_package(SDL2 2.26.4 REQUIRED)
if (NOT YUZU_USE_EXTERNAL_SDL2)
find_package(SDL2 2.26.4 REQUIRED)
endif()
endif()
# List of all FFmpeg components required

2
CMakeModules/CPMUtil.cmake
View file

@ -360,7 +360,7 @@ function(AddCIPackage)
endif()
if (DEFINED ARTIFACT_DIR)
include(${ARTIFACT_DIR}/${ARTIFACT_NAME}.cmake)
include(${ARTIFACT_DIR}/${ARTIFACT_CMAKE}.cmake)
# Overrides find package
CPMAddPackage(

2
externals/CMakeLists.txt vendored
View file

@ -95,7 +95,7 @@ if (ENABLE_LIBUSB AND NOT TARGET libusb::usb)
endif()
# SDL2
if (NOT YUZU_USE_BUNDLED_SDL2)
if (YUZU_USE_EXTERNAL_SDL2)
if (NOT WIN32)
# Yuzu itself needs: Atomic Audio Events Joystick Haptic Sensor Threads Timers
# Since 2.0.18 Atomic+Threads required for HIDAPI/libusb (see https://github.com/libsdl-org/SDL/issues/5095)

6
src/core/CMakeLists.txt
View file

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

8
src/web_service/CMakeLists.txt
View file

@ -18,12 +18,8 @@ create_target_directory_groups(web_service)
target_include_directories(web_service PUBLIC ${cpp-jwt_SOURCE_DIR}/include)
target_link_libraries(web_service PRIVATE common network nlohmann_json::nlohmann_json httplib::httplib cpp-jwt::cpp-jwt)
if (OpenSSL_ADDED)
link_openssl(web_service)
else()
find_package(OpenSSL REQUIRED)
target_link_libraries(web_service PRIVATE OpenSSL::SSL)
endif()
find_package(OpenSSL REQUIRED)
target_link_libraries(web_service PRIVATE OpenSSL::SSL OpenSSL::Crypto)
if (YUZU_USE_PRECOMPILED_HEADERS)
target_precompile_headers(web_service PRIVATE precompiled_headers.h)