diff options
| author | Dave Parks <davep@lindenlab.com> | 2023-02-10 13:32:09 -0600 | 
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2023-02-10 13:32:09 -0600 | 
| commit | 94d3493e7b88d22c13570a48179a49f814e647db (patch) | |
| tree | 14991cffb2c8d5134e623e171a84e4b6ce2f9267 /indra | |
| parent | d0993b737688823efe335a926f52131b444dba00 (diff) | |
| parent | 3fd8bc04c2d50e23921fa18517a3ea66a38eb09b (diff) | |
Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/cmake/LLCommon.cmake | 1 | ||||
| -rw-r--r-- | indra/cmake/Tracy.cmake | 1 | 
2 files changed, 2 insertions, 0 deletions
diff --git a/indra/cmake/LLCommon.cmake b/indra/cmake/LLCommon.cmake index 528b43c3fc..0d73270d63 100644 --- a/indra/cmake/LLCommon.cmake +++ b/indra/cmake/LLCommon.cmake @@ -34,6 +34,7 @@ else (LINUX)          ${BOOST_CONTEXT_LIBRARY}           ${BOOST_THREAD_LIBRARY}           ${BOOST_SYSTEM_LIBRARY} +        ${TRACY_LIBRARY}          )  endif (LINUX) diff --git a/indra/cmake/Tracy.cmake b/indra/cmake/Tracy.cmake index dba57eb920..2cc9576ea1 100644 --- a/indra/cmake/Tracy.cmake +++ b/indra/cmake/Tracy.cmake @@ -17,6 +17,7 @@ if (USE_TRACY)    if (DARWIN)      MESSAGE(STATUS "Including Tracy for Darwin: '${TRACY_INCLUDE_DIR}'") +    set(TRACY_LIBRARY "tracy")    endif (DARWIN)    if (LINUX)  | 
