diff options
| author | crueter <crueter@eden-emu.dev> | 2025-10-17 04:20:11 +0200 |
|---|---|---|
| committer | crueter <crueter@eden-emu.dev> | 2025-10-17 04:20:11 +0200 |
| commit | 551f244dfd48d0e0c1d6db82b39d1ccaa1b6dc06 (patch) | |
| tree | 03cc2d6cb0de906b7c8a7a3bb3264802ad6f6163 /CMakeModules | |
| parent | ef14303c483672cb15bf91bdfb387e930c7288d9 (diff) | |
[dynarmic, qt] fix build with QuaZip <=1.4 and fmt v9 (#2755)
Signed-off-by: crueter <crueter@eden-emu.dev>
Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/2755
Diffstat (limited to 'CMakeModules')
| -rw-r--r-- | CMakeModules/FindDiscordRPC.cmake | 42 |
1 files changed, 24 insertions, 18 deletions
diff --git a/CMakeModules/FindDiscordRPC.cmake b/CMakeModules/FindDiscordRPC.cmake index 44ca9904f4..5ae9f4f999 100644 --- a/CMakeModules/FindDiscordRPC.cmake +++ b/CMakeModules/FindDiscordRPC.cmake @@ -1,27 +1,33 @@ +# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project +# SPDX-License-Identifier: GPL-3.0-or-later + # SPDX-FileCopyrightText: 2022 Alexandre Bouvier <contact@amb.tf> # # SPDX-License-Identifier: GPL-3.0-or-later -find_path(DiscordRPC_INCLUDE_DIR discord_rpc.h) +find_package(DiscordRPC CONFIG QUIET) -find_library(DiscordRPC_LIBRARY discord-rpc) +if (NOT DiscordRPC_FOUND) + find_path(DiscordRPC_INCLUDE_DIR discord_rpc.h) + find_library(DiscordRPC_LIBRARY discord-rpc) -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(DiscordRPC - REQUIRED_VARS - DiscordRPC_LIBRARY - DiscordRPC_INCLUDE_DIR -) + include(FindPackageHandleStandardArgs) + find_package_handle_standard_args(DiscordRPC + REQUIRED_VARS + DiscordRPC_LIBRARY + DiscordRPC_INCLUDE_DIR + ) -if (DiscordRPC_FOUND AND NOT TARGET DiscordRPC::discord-rpc) - add_library(DiscordRPC::discord-rpc UNKNOWN IMPORTED) - set_target_properties(DiscordRPC::discord-rpc PROPERTIES - IMPORTED_LOCATION "${DiscordRPC_LIBRARY}" - INTERFACE_INCLUDE_DIRECTORIES "${DiscordRPC_INCLUDE_DIR}" + if (DiscordRPC_FOUND AND NOT TARGET DiscordRPC::discord-rpc) + add_library(DiscordRPC::discord-rpc UNKNOWN IMPORTED) + set_target_properties(DiscordRPC::discord-rpc PROPERTIES + IMPORTED_LOCATION "${DiscordRPC_LIBRARY}" + INTERFACE_INCLUDE_DIRECTORIES "${DiscordRPC_INCLUDE_DIR}" + ) + endif() + + mark_as_advanced( + DiscordRPC_INCLUDE_DIR + DiscordRPC_LIBRARY ) endif() - -mark_as_advanced( - DiscordRPC_INCLUDE_DIR - DiscordRPC_LIBRARY -) |