diff options
author | Dave Houlton <euclid@lindenlab.com> | 2021-03-10 09:27:21 -0700 |
---|---|---|
committer | Dave Houlton <euclid@lindenlab.com> | 2021-03-10 09:34:16 -0700 |
commit | 303feae305eb526d75b7d9c8b640407cb8003469 (patch) | |
tree | 0e322ed210d9600530f0d916fbb18f8330e6aee7 /indra/linux_crash_logger | |
parent | 9fdd1582774a928242b7fec91bbd951b123296e8 (diff) | |
parent | 88d837c16e768c5262073a7df965066d4bd8842c (diff) |
Merge branch 'master' v6.4.17 into DRTVWR-525
Diffstat (limited to 'indra/linux_crash_logger')
-rw-r--r-- | indra/linux_crash_logger/CMakeLists.txt | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/linux_crash_logger/CMakeLists.txt b/indra/linux_crash_logger/CMakeLists.txt index aa82ed12cc..d789c850a0 100644 --- a/indra/linux_crash_logger/CMakeLists.txt +++ b/indra/linux_crash_logger/CMakeLists.txt @@ -9,7 +9,7 @@ include(LLCommon) include(LLCrashLogger) include(LLMath) include(LLMessage) -include(LLFileSystem) +include(LLVFS) include(LLXML) include(Linking) include(UI) @@ -21,7 +21,7 @@ include_directories( ${LLCOMMON_INCLUDE_DIRS} ${LLCRASHLOGGER_INCLUDE_DIRS} ${LLMATH_INCLUDE_DIRS} - ${LLFILESYSTEM_INCLUDE_DIRS} + ${LLVFS_INCLUDE_DIRS} ${LLXML_INCLUDE_DIRS} ${FREETYPE_INCLUDE_DIRS} ) @@ -62,9 +62,10 @@ set(LIBRT_LIBRARY rt) target_link_libraries(linux-crash-logger ${LLCRASHLOGGER_LIBRARIES} - ${LLFILESYSTEM_LIBRARIES} + ${LLVFS_LIBRARIES} ${LLXML_LIBRARIES} ${LLMESSAGE_LIBRARIES} + ${LLVFS_LIBRARIES} ${LLMATH_LIBRARIES} ${LLCOREHTTP_LIBRARIES} ${LLCOMMON_LIBRARIES} |