summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPtolemy <ptolemy@lindenlab.com>2021-08-31 21:23:10 -0700
committerPtolemy <ptolemy@lindenlab.com>2021-08-31 21:23:10 -0700
commit240000c01cb6dc43203584809eb63452b3c80b75 (patch)
tree219ed9a0fd582938bb39e52adc068aedad851a63
parentcdf2bdafd394a97b917cc0a71b2bc8531cce40c7 (diff)
SL-15709: Use standardized autobuild name; set TRACY_INCLUDE_DIR if Tracy not enabled
-rw-r--r--indra/cmake/Tracy.cmake10
1 files changed, 6 insertions, 4 deletions
diff --git a/indra/cmake/Tracy.cmake b/indra/cmake/Tracy.cmake
index 4750bdc349..dfa3e83039 100644
--- a/indra/cmake/Tracy.cmake
+++ b/indra/cmake/Tracy.cmake
@@ -1,9 +1,9 @@
# -*- cmake -*-
include(Prebuilt)
-set(TRACY OFF CACHE BOOL "Use Tracy profiler.")
+set(USE_TRACY OFF CACHE BOOL "Use Tracy profiler.")
-if (TRACY)
+if (USE_TRACY)
set(TRACY_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/tracy)
# See: indra/llcommon/llprofiler.h
@@ -24,7 +24,9 @@ if (TRACY)
MESSAGE(STATUS "Including Tracy for Linux: '${TRACY_INCLUDE_DIR}'")
set(TRACY_LIBRARY "")
endif (LINUX)
-else (TRACY)
+else (USE_TRACY)
+ # Tracy.cmake should not set LLCOMMON_INCLUDE_DIRS, let LLCommon.cmake do that
+ set(TRACY_INCLUDE_DIR "")
set(TRACY_LIBRARY "")
-endif (TRACY)
+endif (USE_TRACY)