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

[cmake] guiprivate fix, linux/aarch64

Browse source 
Signed-off-by: crueter <crueter@eden-emu.dev>
This commit is contained in:
crueter 2025-08-21 13:10:09 -04:00
parent 97a11fc8dc
commit f1983492ae
3 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
CMakeLists.txt
View file

@ -412,6 +412,7 @@ if (YUZU_USE_CPM)
REPO crueter-ci/OpenSSL REPO crueter-ci/OpenSSL
VERSION 3.5.2 VERSION 3.5.2
MIN_VERSION 1.1.1 MIN_VERSION 1.1.1
FORCE_DOWNLOAD ${FORCE_DOWNLOAD_OPENSSL}
) )
endif() endif()
@ -684,8 +685,8 @@ if (ENABLE_SDL2)
REPO crueter-ci/SDL2 REPO crueter-ci/SDL2
VERSION 2.32.8 VERSION 2.32.8
MIN_VERSION 2.26.4 MIN_VERSION 2.26.4
DISABLED_PLATFORMS "solaris"
CMAKE_FILENAME sdl2 CMAKE_FILENAME sdl2
FORCE_DOWNLOAD ${FORCE_DOWNLOAD_SDL2}
) )
elseif (YUZU_USE_EXTERNAL_SDL2) elseif (YUZU_USE_EXTERNAL_SDL2)
message(STATUS "Using SDL2 from externals.") message(STATUS "Using SDL2 from externals.")
@ -758,7 +759,7 @@ if (ENABLE_QT)
endif() endif()
if (CMAKE_SYSTEM_NAME STREQUAL "Linux") if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
find_package(Qt6 REQUIRED COMPONENTS DBus GuiPrivate) find_package(Qt6 REQUIRED COMPONENTS DBus OPTIONAL_COMPONENTS GuiPrivate)
elseif (UNIX AND NOT APPLE) elseif (UNIX AND NOT APPLE)
find_package(Qt6 REQUIRED COMPONENTS DBus Gui) find_package(Qt6 REQUIRED COMPONENTS DBus Gui)
endif() endif()

6
CMakeModules/CPMUtil.cmake
View file

@ -355,10 +355,14 @@ function(AddCIPackage)
add_ci_package(freebsd) add_ci_package(freebsd)
endif() endif()
if(PLATFORM_LINUX OR ARTIFACT_FORCE_DOWNLOAD AND NOT "linux" IN_LIST DISABLED_PLATFORMS) if((PLATFORM_LINUX AND ARCHITECTURE_x86_64) OR ARTIFACT_FORCE_DOWNLOAD AND NOT "linux" IN_LIST DISABLED_PLATFORMS)
add_ci_package(linux) add_ci_package(linux)
endif() endif()
if((PLATFORM_LINUX AND ARCHITECTURE_arm64) OR ARTIFACT_FORCE_DOWNLOAD AND NOT "linux" IN_LIST DISABLED_PLATFORMS)
add_ci_package(linux-aarch64)
endif()
if (DEFINED ARTIFACT_DIR) if (DEFINED ARTIFACT_DIR)
include(${ARTIFACT_DIR}/${ARTIFACT_CMAKE}.cmake) include(${ARTIFACT_DIR}/${ARTIFACT_CMAKE}.cmake)

6
src/yuzu/CMakeLists.txt
View file

@ -406,7 +406,11 @@ if (NOT WIN32)
target_include_directories(yuzu PRIVATE ${Qt6Gui_PRIVATE_INCLUDE_DIRS}) target_include_directories(yuzu PRIVATE ${Qt6Gui_PRIVATE_INCLUDE_DIRS})
endif() endif()
if (UNIX AND NOT APPLE) if (UNIX AND NOT APPLE)
target_link_libraries(yuzu PRIVATE Qt6::DBus Qt6::GuiPrivate) target_link_libraries(yuzu PRIVATE Qt6::DBus)
if (TARGET Qt6::GuiPrivate)
target_link_libraries(yuzu PRIVATE Qt6::GuiPrivate)
endif()
endif() endif()
target_compile_definitions(yuzu PRIVATE target_compile_definitions(yuzu PRIVATE