livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Modernize Discord CMake

master
Ansariel 2023-04-05 13:14:08 +02:00
parent 23b0537fff
commit b0b1d592ea
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
indra/cmake/Discord.cmake
View File

@ -1,13 +1,19 @@
# -*- cmake -*-
include_guard()
add_library(fs::discord INTERFACE IMPORTED)
include(Prebuilt)
use_prebuilt_binary(discord-rpc)
set(DISCORD_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/discord-rpc)
if (WINDOWS)
set(DISCORD_LIBRARY discord-rpc)
target_link_libraries(fs::discord INTERFACE discord-rpc)
elseif (LINUX)
set(DISCORD_LIBRARY discord-rpc)
target_link_libraries(fs::discord INTERFACE discord-rpc)
elseif (DARWIN)
set(DISCORD_LIBRARY discord-rpc)
target_link_libraries(fs::discord INTERFACE discord-rpc)
endif (WINDOWS)
target_include_directories(fs::discord SYSTEM INTERFACE
${AUTOBUILD_INSTALL_DIR}/include/discord-rpc
)

4
indra/newview/CMakeLists.txt
View File

@ -2381,15 +2381,13 @@ target_link_libraries(${VIEWER_BINARY_NAME}
ll::bugsplat
ll::tracy
fs::glod # <FS:Beq/> restore GLOD dependencies
# fs::growl # <FS:Ansariel> Growl support <FS:Zi> added further down for win/mac only
fs::discord # <FS:Ansariel> Discord support
)
if( TARGET ll::intel_memops )
target_link_libraries(${VIEWER_BINARY_NAME} ll::intel_memops )
endif()
target_link_libraries(${VIEWER_BINARY_NAME} ${DISCORD_LIBRARY} )
if (USE_BUGSPLAT)
target_link_libraries(${VIEWER_BINARY_NAME}
${BUGSPLAT_LIBRARIES}