diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-11-16 01:24:03 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-11-16 01:24:03 +0200 |
| commit | ab4d4a4817a3c885e5a21bf1d89119dd5bc37c4f (patch) | |
| tree | 6fa087eecf4ebd2fb984b3ecb54fd3286c762478 /indra/linux_crash_logger | |
| parent | 0505c6ebbb9060d215f61884d06f22d64d2aaf6d (diff) | |
| parent | 0bffd3d365023fea504b1070480e7b2f72080129 (diff) | |
Merge branch 'DRTVWR-519' into DRTVWR-552-cache-360
# Conflicts:
# indra/newview/app_settings/settings.xml
Diffstat (limited to 'indra/linux_crash_logger')
| -rw-r--r-- | indra/linux_crash_logger/CMakeLists.txt | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/linux_crash_logger/CMakeLists.txt b/indra/linux_crash_logger/CMakeLists.txt index d789c850a0..aa82ed12cc 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(LLVFS) +include(LLFileSystem) include(LLXML) include(Linking) include(UI) @@ -21,7 +21,7 @@ include_directories( ${LLCOMMON_INCLUDE_DIRS} ${LLCRASHLOGGER_INCLUDE_DIRS} ${LLMATH_INCLUDE_DIRS} - ${LLVFS_INCLUDE_DIRS} + ${LLFILESYSTEM_INCLUDE_DIRS} ${LLXML_INCLUDE_DIRS} ${FREETYPE_INCLUDE_DIRS} ) @@ -62,10 +62,9 @@ set(LIBRT_LIBRARY rt) target_link_libraries(linux-crash-logger ${LLCRASHLOGGER_LIBRARIES} - ${LLVFS_LIBRARIES} + ${LLFILESYSTEM_LIBRARIES} ${LLXML_LIBRARIES} ${LLMESSAGE_LIBRARIES} - ${LLVFS_LIBRARIES} ${LLMATH_LIBRARIES} ${LLCOREHTTP_LIBRARIES} ${LLCOMMON_LIBRARIES} |