diff options
| author | Michael Pohoreski <ptolemy@lindenlab.com> | 2021-09-04 00:57:46 +0000 |
|---|---|---|
| committer | Michael Pohoreski <ptolemy@lindenlab.com> | 2021-09-04 00:57:46 +0000 |
| commit | 0f60db6220f544e43a686312cc5e91998309c996 (patch) | |
| tree | fba3680c5a6b8df78da930778031f48f98a94e61 /indra/cmake | |
| parent | 0528890ab1fec27014992b6388498a6e881d9f24 (diff) | |
| parent | c37cc7c3a4888fdca132613d627d7ad90517332a (diff) | |
Merged in SL-15709-Tracy (pull request #677)
SL-15709: Windows: Include Tracy source directly; don't use a library
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/LLCommon.cmake | 1 | ||||
| -rw-r--r-- | indra/cmake/Tracy.cmake | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/indra/cmake/LLCommon.cmake b/indra/cmake/LLCommon.cmake index b6f310fe12..34499aaa36 100644 --- a/indra/cmake/LLCommon.cmake +++ b/indra/cmake/LLCommon.cmake @@ -33,7 +33,6 @@ 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 dfa3e83039..1b8c3db2e2 100644 --- a/indra/cmake/Tracy.cmake +++ b/indra/cmake/Tracy.cmake @@ -12,17 +12,14 @@ if (USE_TRACY) if (WINDOWS) MESSAGE(STATUS "Including Tracy for Windows: '${TRACY_INCLUDE_DIR}'") - set(TRACY_LIBRARY tracy) 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 (USE_TRACY) # Tracy.cmake should not set LLCOMMON_INCLUDE_DIRS, let LLCommon.cmake do that |