diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2021-07-19 16:26:33 -0600 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2021-07-27 17:46:29 -0600 |
| commit | 1a782ed690e56bf81ec9073041c7559e1762855d (patch) | |
| tree | a4c20189069e945e3a34c21146fb14744a62a3a7 /indra | |
| parent | 08f04113c9252258c9cb6132efa327432c3c27e0 (diff) | |
SL-15595 update viewer autobuild to import tracy lib
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/cmake/Tracy.cmake | 17 | ||||
| -rw-r--r-- | indra/llcommon/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | indra/newview/CMakeLists.txt | 3 |
3 files changed, 22 insertions, 0 deletions
diff --git a/indra/cmake/Tracy.cmake b/indra/cmake/Tracy.cmake new file mode 100644 index 0000000000..bf09bccd4b --- /dev/null +++ b/indra/cmake/Tracy.cmake @@ -0,0 +1,17 @@ +# -*- cmake -*- +include(Prebuilt) + +set(TRACY ON CACHE BOOL "Use Tracy profiler.") + +if (TRACY) + set(TRACY_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/tracy) + if (WINDOWS) + use_prebuilt_binary(tracy) + set(TRACY_LIBRARY tracy) + else (WINDOWS) + set(TRACY_LIBRARY "") + endif (WINDOWS) +else (TRACY) + set(TRACY_LIBRARY "") +endif (TRACY) + diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt index dd266630ea..f1b0506659 100644 --- a/indra/llcommon/CMakeLists.txt +++ b/indra/llcommon/CMakeLists.txt @@ -13,6 +13,7 @@ include(GoogleBreakpad) include(Copy3rdPartyLibs) include(ZLIB) include(URIPARSER) +include(Tracy) include_directories( ${EXPAT_INCLUDE_DIRS} @@ -21,6 +22,7 @@ include_directories( ${ZLIB_INCLUDE_DIRS} ${BREAKPAD_INCLUDE_DIRECTORIES} ${URIPARSER_INCLUDE_DIRS} + ${TRACY_INCLUDE_DIR} ) # add_executable(lltreeiterators lltreeiterators.cpp) diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 2995a006ac..fbe75af712 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -47,6 +47,7 @@ include(OpenGL) include(OpenSSL) include(PNG) include(TemplateCheck) +include(Tracy) include(UI) include(UnixInstall) include(ViewerMiscLibs) @@ -92,6 +93,7 @@ include_directories( ${LIBS_PREBUILT_DIR}/include/collada/1.4 ${LLAPPEARANCE_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR} + ${TRACY_INCLUDE_DIR} ) include_directories(SYSTEM @@ -2066,6 +2068,7 @@ target_link_libraries(${VIEWER_BINARY_NAME} ${LLPHYSICS_LIBRARIES} ${LLPHYSICSEXTENSIONS_LIBRARIES} ${LLAPPEARANCE_LIBRARIES} + ${TRACY_LIBRARY} ) if (USE_BUGSPLAT) |