diff options
| author | Rye <rye@lindenlab.com> | 2024-11-01 03:46:13 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-01 03:46:13 -0400 |
| commit | 5bbee82ee4978298cd0769ea47e16578631eca9b (patch) | |
| tree | 658539f94c039f3bab380c6fd6c96afa3401270b | |
| parent | c3590fd827e65cc127a82735ad856f5dff0f3af4 (diff) | |
| parent | d997bbd6ac29ebb38e73d030f0db12e25bacd1c1 (diff) | |
Merge pull request #2806 from secondlife/rye/linuxbuild
Fix disabling bugsplat on linux build
| -rw-r--r-- | indra/cmake/bugsplat.cmake | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/indra/cmake/bugsplat.cmake b/indra/cmake/bugsplat.cmake index 0798d4f51f..8916cb282c 100644 --- a/indra/cmake/bugsplat.cmake +++ b/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 () |