diff --git a/indra/cmake/Discord.cmake b/indra/cmake/Discord.cmake
index e0e38003c3..f9f97a4dc7 100644
--- a/indra/cmake/Discord.cmake
+++ b/indra/cmake/Discord.cmake
@@ -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
+        )
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 2e58eafb6f..2a59e93bc5 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -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}