Fix mac dsym generation when crash reporting enabled

indra/cmake/DiscordSDK.cmake

 # -*- cmake -*-
 include(Linking)
 include(Prebuilt)
-
-if (INSTALL_PROPRIETARY)
-  set(USE_DISCORD ON CACHE BOOL "Use Discord SDK" FORCE)
-endif (INSTALL_PROPRIETARY)
+include(Variables)
 
 if (USE_DISCORD)
   if (STANDALONE)
@@ -32,12 +29,6 @@ if (USE_DISCORD)
     add_definitions(-DUSE_DISCORD=1)
   endif (STANDALONE)
 
-  if(DEFINED ENV{DISCORD_CLIENTID})
-    set(DISCORD_CLIENTID $ENV{DISCORD_CLIENTID} CACHE STRING "Discord Client ID" FORCE)
-  else()
-    set(DISCORD_CLIENTID "" CACHE STRING "Discord Client ID")
-  endif()
-
   if(DISCORD_CLIENTID STREQUAL "")
     message(FATAL_ERROR "You must set a ClientID with -DDISCORD_CLIENTID= to enable Discord integration")
   endif()

indra/cmake/Sentry.cmake

+# -*- cmake -*-
+include(Linking)
+include(Prebuilt)
 include(Variables)
 
-#Crash reporting
-option(USE_SENTRY "Use the Sentry crash reporting system" OFF)
-if (DEFINED ENV{USE_SENTRY})
-  set(USE_SENTRY $ENV{USE_SENTRY} CACHE BOOL "" FORCE)
-endif()
-
-if(DEFINED ENV{SENTRY_DSN})
-    set(SENTRY_DSN $ENV{SENTRY_DSN} CACHE STRING "Sentry DSN" FORCE)
-endif()
-
-if (INSTALL_PROPRIETARY)
-    # Note that viewer_manifest.py makes decision based on SENTRY_DSN and not USE_SENTRY
-    if (SENTRY_DSN)
-        set(USE_SENTRY ON  CACHE BOOL "Use the Sentry crash reporting system" FORCE)
-    else (SENTRY_DSN)
-        set(USE_SENTRY OFF CACHE BOOL "Use the Sentry crash reporting system" FORCE)
-    endif (SENTRY_DSN)
-else (INSTALL_PROPRIETARY)
-    set(USE_SENTRY OFF CACHE BOOL "Use the Sentry crash reporting system" FORCE)
-endif (INSTALL_PROPRIETARY)
-
 if (USE_SENTRY)
     if (NOT USESYSTEMLIBS)
         include(Prebuilt)

indra/cmake/Variables.cmake

@@ -57,6 +57,43 @@ if (DEFINED ENV{USE_DISCORD})
   set(USE_DISCORD $ENV{USE_DISCORD} CACHE BOOL "" FORCE)
 endif()
 
+if(DEFINED ENV{DISCORD_CLIENTID})
+  set(DISCORD_CLIENTID $ENV{DISCORD_CLIENTID} CACHE STRING "Discord Client ID" FORCE)
+else()
+  set(DISCORD_CLIENTID "" CACHE STRING "Discord Client ID")
+endif()
+
+if (INSTALL_PROPRIETARY)
+  set(USE_DISCORD ON CACHE BOOL "Use Discord SDK" FORCE)
+  # Note that viewer_manifest.py makes decision based on SENTRY_DSN and not USE_SENTRY
+  if (DISCORD_CLIENTID)
+      set(USE_DISCORD ON CACHE BOOL "Use Discord SDK" FORCE)
+  else ()
+      set(USE_DISCORD OFF CACHE BOOL "Use Discord SDK" FORCE)
+  endif ()
+endif ()
+
+#Crash reporting
+option(USE_SENTRY "Use the Sentry crash reporting system" OFF)
+if (DEFINED ENV{USE_SENTRY})
+  set(USE_SENTRY $ENV{USE_SENTRY} CACHE BOOL "" FORCE)
+endif()
+
+if(DEFINED ENV{SENTRY_DSN})
+  set(SENTRY_DSN $ENV{SENTRY_DSN} CACHE STRING "Sentry DSN" FORCE)
+endif()
+
+if (INSTALL_PROPRIETARY)
+  # Note that viewer_manifest.py makes decision based on SENTRY_DSN and not USE_SENTRY
+  if (SENTRY_DSN)
+      set(USE_SENTRY ON  CACHE BOOL "Use the Sentry crash reporting system" FORCE)
+  else ()
+      set(USE_SENTRY OFF CACHE BOOL "Use the Sentry crash reporting system" FORCE)
+  endif ()
+else ()
+  set(USE_SENTRY OFF CACHE BOOL "Use the Sentry crash reporting system" FORCE)
+endif ()
+
 if(LIBS_CLOSED_DIR)
   file(TO_CMAKE_PATH "${LIBS_CLOSED_DIR}" LIBS_CLOSED_DIR)
 else(LIBS_CLOSED_DIR)