From 0b7548c6b69f8259aae987c479a85a9d0fd04d89 Mon Sep 17 00:00:00 2001 From: Brad Linden Date: Mon, 23 Sep 2024 12:45:12 -0700 Subject: Turn off tracy on linux to unbreak the build. --- indra/cmake/Tracy.cmake | 5 +++++ 1 file changed, 5 insertions(+) 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) -- cgit v1.2.3