diff options
| author | Ptolemy <ptolemy@lindenlab.com> | 2021-08-31 21:41:03 -0700 |
|---|---|---|
| committer | Ptolemy <ptolemy@lindenlab.com> | 2021-09-03 17:53:44 -0700 |
| commit | 6d2cad965c63cd352f617537b73506790fd8f4a4 (patch) | |
| tree | 2418a982b4abbb3e8a090e43e00c1a6fd9e1c1b4 /indra | |
| parent | 91f4d7f7a04839bb9c5e320dcb5f90314586624f (diff) | |
SL-15709: Fix LLCommon not setting Tracy include directory and not linking to tracy.lib
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/cmake/LLCommon.cmake | 6 | ||||
| -rw-r--r-- | indra/llcommon/CMakeLists.txt | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/indra/cmake/LLCommon.cmake b/indra/cmake/LLCommon.cmake index c1cfa51cfb..b6f310fe12 100644 --- a/indra/cmake/LLCommon.cmake +++ b/indra/cmake/LLCommon.cmake @@ -3,12 +3,14 @@ include(APR) include(Boost) include(EXPAT) +include(Tracy) include(ZLIB) set(LLCOMMON_INCLUDE_DIRS ${LIBS_OPEN_DIR}/llcommon ${APRUTIL_INCLUDE_DIR} ${APR_INCLUDE_DIR} + ${TRACY_INCLUDE_DIR} ) set(LLCOMMON_SYSTEM_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} @@ -30,7 +32,9 @@ else (LINUX) ${BOOST_FIBER_LIBRARY} ${BOOST_CONTEXT_LIBRARY} ${BOOST_THREAD_LIBRARY} - ${BOOST_SYSTEM_LIBRARY}) + ${BOOST_SYSTEM_LIBRARY} + ${TRACY_LIBRARY} + ) endif (LINUX) set(LLCOMMON_LINK_SHARED OFF CACHE BOOL "Build the llcommon target as a static library.") diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt index 28bf5d0c39..066d0404ac 100644 --- a/indra/llcommon/CMakeLists.txt +++ b/indra/llcommon/CMakeLists.txt @@ -305,6 +305,7 @@ target_link_libraries( ${BOOST_SYSTEM_LIBRARY} ${GOOGLE_PERFTOOLS_LIBRARIES} ${URIPARSER_LIBRARIES} + ${TRACY_LIBRARY} ) if (DARWIN) |