Merge pull request #2806 from secondlife/rye/linuxbuild

Fix disabling bugsplat on linux build

Author: Rye

indra/cmake/bugsplat.cmake

@@ -5,14 +5,15 @@ if (INSTALL_PROPRIETARY AND NOT LINUX)
     else (BUGSPLAT_DB)
         set(USE_BUGSPLAT OFF CACHE BOOL "Use the BugSplat crash reporting system")
     endif (BUGSPLAT_DB)
-else (INSTALL_PROPRIETARY AND NOT LINUX)
+else ()
     set(USE_BUGSPLAT OFF CACHE BOOL "Use the BugSplat crash reporting system")
-endif (INSTALL_PROPRIETARY AND NOT LINUX)
+    set(BUGSPLAT_DB "" CACHE STRING "BugSplat crash database name")
+endif ()
 
 include_guard()
 add_library( ll::bugsplat INTERFACE IMPORTED )
 
-if (USE_BUGSPLAT)
+if (USE_BUGSPLAT AND NOT LINUX)
     include(Prebuilt)
     use_prebuilt_binary(bugsplat)
     if (WINDOWS)
@@ -36,6 +37,7 @@ if (USE_BUGSPLAT)
 
     set_property( TARGET ll::bugsplat APPEND PROPERTY INTERFACE_COMPILE_DEFINITIONS LL_BUGSPLAT)
 else()
+    set(USE_BUGSPLAT OFF CACHE BOOL "Use the BugSplat crash reporting system" FORCE)
     set(BUGSPLAT_DB "" CACHE STRING "BugSplat crash database name" FORCE)
-endif (USE_BUGSPLAT)
+endif ()