diff options
| author | Michael Pohoreski <ptolemy@lindenlab.com> | 2021-08-27 07:00:13 +0000 |
|---|---|---|
| committer | Michael Pohoreski <ptolemy@lindenlab.com> | 2021-08-27 07:00:13 +0000 |
| commit | 134dc986361256d71884257cb870a1f1ac6a848c (patch) | |
| tree | 5dc0b5719916977b4a35005aed24bd4aedd19d93 /indra/cmake | |
| parent | 7637f9845b351a7cb3e41d97db7d3715e119e2df (diff) | |
| parent | cdf2bdafd394a97b917cc0a71b2bc8531cce40c7 (diff) | |
Merged in SL-15709-Tracy (pull request #634)
SL-15709: Add Tracy support to viewer
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/LLCommon.cmake | 2 | ||||
| -rw-r--r-- | indra/cmake/Tracy.cmake | 21 |
2 files changed, 18 insertions, 5 deletions
diff --git a/indra/cmake/LLCommon.cmake b/indra/cmake/LLCommon.cmake index 8900419f9b..c1cfa51cfb 100644 --- a/indra/cmake/LLCommon.cmake +++ b/indra/cmake/LLCommon.cmake @@ -30,7 +30,7 @@ else (LINUX) ${BOOST_FIBER_LIBRARY} ${BOOST_CONTEXT_LIBRARY} ${BOOST_THREAD_LIBRARY} - ${BOOST_SYSTEM_LIBRARY} ) + ${BOOST_SYSTEM_LIBRARY}) endif (LINUX) set(LLCOMMON_LINK_SHARED OFF CACHE BOOL "Build the llcommon target as a static library.") diff --git a/indra/cmake/Tracy.cmake b/indra/cmake/Tracy.cmake index bf09bccd4b..4750bdc349 100644 --- a/indra/cmake/Tracy.cmake +++ b/indra/cmake/Tracy.cmake @@ -1,16 +1,29 @@ # -*- cmake -*- include(Prebuilt) -set(TRACY ON CACHE BOOL "Use Tracy profiler.") +set(TRACY OFF CACHE BOOL "Use Tracy profiler.") if (TRACY) set(TRACY_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/tracy) + +# See: indra/llcommon/llprofiler.h + add_definitions(-DLL_PROFILER_CONFIGURATION=2) + use_prebuilt_binary(tracy) + if (WINDOWS) - use_prebuilt_binary(tracy) + MESSAGE(STATUS "Including Tracy for Windows: '${TRACY_INCLUDE_DIR}'") set(TRACY_LIBRARY tracy) - else (WINDOWS) - set(TRACY_LIBRARY "") endif (WINDOWS) + + if (DARWIN) + MESSAGE(STATUS "Including Tracy for Darwin: '${TRACY_INCLUDE_DIR}'") + set(TRACY_LIBRARY "") + endif (DARWIN) + + if (LINUX) + MESSAGE(STATUS "Including Tracy for Linux: '${TRACY_INCLUDE_DIR}'") + set(TRACY_LIBRARY "") + endif (LINUX) else (TRACY) set(TRACY_LIBRARY "") endif (TRACY) |