diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2021-03-02 14:25:36 -0700 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2021-03-02 14:25:36 -0700 |
| commit | 363bc9d9d0fe4f42b0dfbdb7adeb9a481a4fe55b (patch) | |
| tree | 600cd078a00e80a33504c748540e333a34a4b30d /indra/linux_crash_logger | |
| parent | 31bca613a6011f5e1a95cffafd283e445142557f (diff) | |
| parent | 2b385841f3031d599bdb226f0f859e51b09870f8 (diff) | |
Merge branch 'master' v 6.4.15 into DRTVWR-525
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} |