diff options
| author | Brad Linden <46733234+brad-linden@users.noreply.github.com> | 2024-09-23 13:31:55 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-23 13:31:55 -0700 |
| commit | d8e52ec001c476a2320f2d5caceb813465d707e4 (patch) | |
| tree | 2fe671253d83620fba0e0b1c6c488997b558a7ef /indra/cmake/Tracy.cmake | |
| parent | 3747dd9a085e4d75ec21c8048f1269bc3f29e582 (diff) | |
| parent | 38916ebf367aa400d8151d78204e714d40e8c323 (diff) | |
Merge pull request #940 from secondlife/release/maint-b
Maintenance B merges into develop
Diffstat (limited to 'indra/cmake/Tracy.cmake')
| -rw-r--r-- | indra/cmake/Tracy.cmake | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/cmake/Tracy.cmake b/indra/cmake/Tracy.cmake index a7eac2711f..9eee9eb57f 100644 --- a/indra/cmake/Tracy.cmake +++ b/indra/cmake/Tracy.cmake @@ -12,6 +12,11 @@ else() option(USE_TRACY "Use Tracy profiler." OFF) endif() +if (LINUX) + # tracy currently conflicts with llcommon/stdtypes.h on linux. keep it disabled until we fix it + set(USE_TRACY OFF) +endif(LINUX) + if (USE_TRACY) option(USE_TRACY_ON_DEMAND "Use on-demand Tracy profiling." ON) option(USE_TRACY_LOCAL_ONLY "Disallow remote Tracy profiling." OFF) |