From a6666322ed66a05566bf50e5d2e8fb1284cbfb4e Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Wed, 11 Sep 2019 22:04:02 +0200
Subject: [PATCH] Simplify including of Discord rich presence files

---
 indra/newview/CMakeLists.txt | 28 +++++++---------------------
 1 file changed, 7 insertions(+), 21 deletions(-)

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 5fc7b0d116..2bcb6a09a4 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1631,6 +1631,13 @@ configure_file(
 list(APPEND viewer_HEADER_FILES ${CMAKE_CURRENT_BINARY_DIR}/exoflickrkeys.h)
 # </exodus>
 
+#<FS:LO> Discord rich presence
+  if (USE_DISCORD)
+    LIST(APPEND viewer_HEADER_FILES fsfloaterdiscord.h fsdiscordconnect.h)
+    LIST(APPEND viewer_SOURCE_FILES fsfloaterdiscord.cpp fsdiscordconnect.cpp)
+  endif (USE_DISCORD)
+#</FS:LO>
+
 # <FS:TS> Generate the version information header file.
 configure_file(
     ${CMAKE_CURRENT_SOURCE_DIR}/fsversionvalues.h.in
@@ -1687,13 +1694,6 @@ if (DARWIN)
          )
 # [FS]
 
-#<FS:LO> Discord rich presence
-  if( USE_DISCORD )
-    LIST(APPEND viewer_HEADER_FILES fsfloaterdiscord.h fsdiscordconnect.h)
-    LIST(APPEND viewer_SOURCE_FILES fsfloaterdiscord.cpp fsdiscordconnect.cpp)
-  endif()
-#</FS:LO>
-
   find_library(AGL_LIBRARY AGL)
   find_library(APPKIT_LIBRARY AppKit)
   find_library(COCOA_LIBRARY Cocoa)
@@ -1753,13 +1753,6 @@ if (LINUX)
     LIST(APPEND viewer_SOURCE_FILES desktopnotifierlinux.cpp growlmanager.cpp)
 # [FS] Growl support
 
-#<FS:LO> Discord rich presence
-  if( USE_DISCORD )
-    LIST(APPEND viewer_HEADER_FILES fsfloaterdiscord.h fsdiscordconnect.h)
-    LIST(APPEND viewer_SOURCE_FILES fsfloaterdiscord.cpp fsdiscordconnect.cpp)
-  endif()
-#</FS:LO>
-
     SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed")
 
     set(viewer_LIBRARIES
@@ -1803,13 +1796,6 @@ if (WINDOWS)
 # [FS]
          )
 
-#<FS:LO> Discord rich presence
-  if( USE_DISCORD )
-    LIST(APPEND viewer_HEADER_FILES fsfloaterdiscord.h fsdiscordconnect.h)
-    LIST(APPEND viewer_SOURCE_FILES fsfloaterdiscord.cpp fsdiscordconnect.cpp)
-  endif()
-#</FS:LO>
-
     # precompiled header configuration
     # llviewerprecompiledheaders.cpp generates
     # the .pch file.