From 35ee550171fc347179d4a7eadbea4bc056a13d44 Mon Sep 17 00:00:00 2001 From: p01arst0rm Date: Mon, 3 May 2021 23:05:11 +0100 Subject: [PATCH] changed discord-rpc to discordRPC --- 3rdparty/CMakeLists.txt | 4 ++-- 3rdparty/discord-rpc/CMakeLists.txt | 14 +++++++------- rpcs3/CMakeLists.txt | 2 +- rpcs3/rpcs3qt/CMakeLists.txt | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt index 666f198da4..d403d63537 100644 --- a/3rdparty/CMakeLists.txt +++ b/3rdparty/CMakeLists.txt @@ -179,7 +179,7 @@ add_library(3rdparty_stblib INTERFACE) target_include_directories(3rdparty_stblib INTERFACE stblib/include) -# discord rpc +# DiscordRPC add_subdirectory(discord-rpc) @@ -394,7 +394,7 @@ add_library(3rdparty::cereal ALIAS 3rdparty_cereal) add_library(3rdparty::opengl ALIAS 3rdparty_opengl) add_library(3rdparty::span ALIAS 3rdparty_span) add_library(3rdparty::stblib ALIAS 3rdparty_stblib) -add_library(3rdparty::discord-rpc ALIAS 3rdparty_discord-rpc) +add_library(3rdparty::discordRPC ALIAS 3rdparty_discordRPC) add_library(3rdparty::alsa ALIAS ${ALSA_TARGET}) add_library(3rdparty::pulse ALIAS ${PULSE_TARGET}) add_library(3rdparty::faudio ALIAS ${FAUDIO_TARGET}) diff --git a/3rdparty/discord-rpc/CMakeLists.txt b/3rdparty/discord-rpc/CMakeLists.txt index 68e1ae8382..34c7c4fdb9 100644 --- a/3rdparty/discord-rpc/CMakeLists.txt +++ b/3rdparty/discord-rpc/CMakeLists.txt @@ -1,10 +1,10 @@ -# discord_rpc -add_library(3rdparty_discord-rpc INTERFACE) +# DiscordRPC +add_library(3rdparty_discordRPC INTERFACE) # We don't want Discord Rich Presence on the BSDs and other OSes if (USE_DISCORD_RPC AND (WIN32 OR CMAKE_SYSTEM MATCHES "Linux" OR APPLE)) if (WIN32 AND NOT MSVC) - ExternalProject_Add(discord-rpc + ExternalProject_Add(discordRPC GIT_REPOSITORY https://github.com/discordapp/discord-rpc BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR} INSTALL_COMMAND "" @@ -12,8 +12,8 @@ if (USE_DISCORD_RPC AND (WIN32 OR CMAKE_SYSTEM MATCHES "Linux" OR APPLE)) endif() - target_include_directories(3rdparty_discord-rpc INTERFACE include) - target_compile_definitions(3rdparty_discord-rpc INTERFACE -DWITH_DISCORD_RPC) + target_include_directories(3rdparty_discordRPC INTERFACE include) + target_compile_definitions(3rdparty_discordRPC INTERFACE -DWITH_DISCORD_RPC) set(DISCORD_RPC_LIB NOTFOUND) if (WIN32) @@ -27,8 +27,8 @@ if (USE_DISCORD_RPC AND (WIN32 OR CMAKE_SYSTEM MATCHES "Linux" OR APPLE)) elseif(APPLE) find_library(DISCORD_RPC_LIB discord-rpc-mac PATHS lib/ NO_DEFAULT_PATH) endif() - target_link_libraries(3rdparty_discord-rpc INTERFACE ${DISCORD_RPC_LIB}) + target_link_libraries(3rdparty_discordRPC INTERFACE ${DISCORD_RPC_LIB}) if(APPLE) - target_link_libraries(3rdparty_discord-rpc INTERFACE "objc" "-framework Foundation" "-framework CoreServices") + target_link_libraries(3rdparty_discordRPC INTERFACE "objc" "-framework Foundation" "-framework CoreServices") endif() endif() diff --git a/rpcs3/CMakeLists.txt b/rpcs3/CMakeLists.txt index d8cc33bfe6..e1a6ccbb99 100644 --- a/rpcs3/CMakeLists.txt +++ b/rpcs3/CMakeLists.txt @@ -85,7 +85,7 @@ set_target_properties(rpcs3 AUTOUIC ON) target_link_libraries(rpcs3 rpcs3_emu rpcs3_ui) -target_link_libraries(rpcs3 3rdparty::discord-rpc 3rdparty::qt5 3rdparty::hidapi 3rdparty::libusb 3rdparty::wolfssl 3rdparty::libcurl) +target_link_libraries(rpcs3 3rdparty::discordRPC 3rdparty::qt5 3rdparty::hidapi 3rdparty::libusb 3rdparty::wolfssl 3rdparty::libcurl) target_link_libraries(rpcs3 ${ADDITIONAL_LIBS}) # Win resource file diff --git a/rpcs3/rpcs3qt/CMakeLists.txt b/rpcs3/rpcs3qt/CMakeLists.txt index 35ea019d41..632fe13c28 100644 --- a/rpcs3/rpcs3qt/CMakeLists.txt +++ b/rpcs3/rpcs3qt/CMakeLists.txt @@ -105,7 +105,7 @@ target_link_libraries(rpcs3_ui PRIVATE rpcs3_emu 3rdparty::zlib 3rdparty::pugixml - 3rdparty::discord-rpc + 3rdparty::discordRPC 3rdparty::hidapi 3rdparty::libusb 3rdparty::libpng