Browse Source
fix catch2, sun again
Signed-off-by: crueter <crueter@eden-emu.dev>
pull/2655/head
crueter
5 months ago
No known key found for this signature in database
GPG Key ID: 425ACD2D4830EBC6
5 changed files with
18 additions and
19 deletions
-
CMakeLists.txt
-
cpmfile.json
-
externals/CMakeLists.txt
-
externals/cpmfile.json
-
src/yuzu/CMakeLists.txt
|
|
|
@ -166,7 +166,7 @@ option(YUZU_USE_CPM "Use CPM to fetch system dependencies (fmt, boost, etc) if n |
|
|
|
|
|
|
|
# ffmpeg |
|
|
|
option(YUZU_USE_BUNDLED_FFMPEG "Download bundled FFmpeg" ${EXT_DEFAULT}) |
|
|
|
cmake_dependent_option(YUZU_USE_EXTERNAL_FFMPEG "Build FFmpeg from source" OFF "NOT WIN32 AND NOT ANDROID" OFF) |
|
|
|
cmake_dependent_option(YUZU_USE_EXTERNAL_FFMPEG "Build FFmpeg from source" "${PLATFORM_SUN}" "NOT WIN32 AND NOT ANDROID" OFF) |
|
|
|
|
|
|
|
# sirit |
|
|
|
option(YUZU_USE_BUNDLED_SIRIT "Download bundled sirit" ${EXT_DEFAULT}) |
|
|
|
@ -456,11 +456,6 @@ if (YUZU_USE_CPM) |
|
|
|
add_library(zstd::zstd ALIAS libzstd_static) |
|
|
|
endif() |
|
|
|
|
|
|
|
# Catch2 |
|
|
|
if (YUZU_TESTS OR DYNARMIC_TESTS) |
|
|
|
AddJsonPackage(catch2) |
|
|
|
endif() |
|
|
|
|
|
|
|
# Opus |
|
|
|
AddJsonPackage(opus) |
|
|
|
|
|
|
|
@ -499,10 +494,6 @@ else() |
|
|
|
find_package(Boost 1.57.0 REQUIRED) |
|
|
|
endif() |
|
|
|
|
|
|
|
if (YUZU_TESTS) |
|
|
|
find_package(Catch2 3.0.1 REQUIRED) |
|
|
|
endif() |
|
|
|
|
|
|
|
if (CMAKE_SYSTEM_NAME STREQUAL "Linux" OR ANDROID) |
|
|
|
find_package(gamemode 1.7 MODULE) |
|
|
|
endif() |
|
|
|
@ -580,6 +571,10 @@ if (ENABLE_CUBEB) |
|
|
|
find_package(cubeb) |
|
|
|
endif() |
|
|
|
|
|
|
|
if (YUZU_TESTS OR DYNARMIC_TESTS) |
|
|
|
find_package(Catch2) |
|
|
|
endif() |
|
|
|
|
|
|
|
if (ENABLE_QT) |
|
|
|
if (YUZU_USE_BUNDLED_QT) |
|
|
|
download_qt(6.8.3) |
|
|
|
|
|
|
|
@ -69,13 +69,6 @@ |
|
|
|
"ZSTD_BUILD_SHARED OFF" |
|
|
|
] |
|
|
|
}, |
|
|
|
"catch2": { |
|
|
|
"package": "Catch2", |
|
|
|
"repo": "catchorg/Catch2", |
|
|
|
"sha": "644821ce28", |
|
|
|
"hash": "f8795f98acf2c02c0db8e734cc866d5caebab4b4a306e93598b97cb3c0c728dafe8283dce27ffe8d42460e5ae7302f3f32e7e274a7f991b73511ac88eef21b1f", |
|
|
|
"version": "3.0.1" |
|
|
|
}, |
|
|
|
"opus": { |
|
|
|
"package": "Opus", |
|
|
|
"repo": "crueter/opus", |
|
|
|
|
|
|
|
@ -170,6 +170,11 @@ if (SPIRV-Tools_ADDED) |
|
|
|
target_link_libraries(SPIRV-Tools-static PRIVATE SPIRV-Tools-opt SPIRV-Tools-link) |
|
|
|
endif() |
|
|
|
|
|
|
|
# Catch2 |
|
|
|
if (YUZU_TESTS OR DYNARMIC_TESTS) |
|
|
|
AddJsonPackage(catch2) |
|
|
|
endif() |
|
|
|
|
|
|
|
# getopt |
|
|
|
if (MSVC) |
|
|
|
add_subdirectory(getopt) |
|
|
|
|
|
|
|
@ -133,6 +133,7 @@ |
|
|
|
] |
|
|
|
}, |
|
|
|
"discord-rpc": { |
|
|
|
"package": "DiscordRPC", |
|
|
|
"repo": "eden-emulator/discord-rpc", |
|
|
|
"sha": "1cf7772bb6", |
|
|
|
"hash": "e9b35e6f2c075823257bcd59f06fe7bb2ccce1976f44818d2e28810435ef79c712a3c4f20f40da41f691342a4058cf86b078eb7f9d9e4dae83c0547c21ec4f97" |
|
|
|
@ -170,5 +171,12 @@ |
|
|
|
"disabled_platforms": [ |
|
|
|
"macos-universal" |
|
|
|
] |
|
|
|
}, |
|
|
|
"catch2": { |
|
|
|
"package": "Catch2", |
|
|
|
"repo": "catchorg/Catch2", |
|
|
|
"sha": "644821ce28", |
|
|
|
"hash": "f8795f98acf2c02c0db8e734cc866d5caebab4b4a306e93598b97cb3c0c728dafe8283dce27ffe8d42460e5ae7302f3f32e7e274a7f991b73511ac88eef21b1f", |
|
|
|
"version": "3.0.1" |
|
|
|
} |
|
|
|
} |
|
|
|
@ -397,8 +397,6 @@ if (NOT WIN32) |
|
|
|
target_include_directories(yuzu PRIVATE ${Qt6Gui_PRIVATE_INCLUDE_DIRS}) |
|
|
|
endif() |
|
|
|
|
|
|
|
target_link_libraries(yuzu PRIVATE Vulkan::Headers) |
|
|
|
|
|
|
|
if (UNIX AND NOT APPLE) |
|
|
|
target_link_libraries(yuzu PRIVATE Qt6::DBus) |
|
|
|
|
|
|
|
|
