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/llxml/CMakeLists.txt | |
| 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/llxml/CMakeLists.txt')
| -rw-r--r-- | indra/llxml/CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llxml/CMakeLists.txt b/indra/llxml/CMakeLists.txt index 013a422d35..3a7a54e51d 100644 --- a/indra/llxml/CMakeLists.txt +++ b/indra/llxml/CMakeLists.txt @@ -5,13 +5,13 @@ project(llxml) include(00-Common) include(LLCommon) include(LLMath) -include(LLVFS) +include(LLFileSystem) include(LLXML) include_directories( ${LLCOMMON_INCLUDE_DIRS} ${LLMATH_INCLUDE_DIRS} - ${LLVFS_INCLUDE_DIRS} + ${LLFILESYSTEM_INCLUDE_DIRS} ) include_directories( ${LLCOMMON_SYSTEM_INCLUDE_DIRS} @@ -42,7 +42,7 @@ add_library (llxml ${llxml_SOURCE_FILES}) # Libraries on which this library depends, needed for Linux builds # Sort by high-level to low-level target_link_libraries( llxml - ${LLVFS_LIBRARIES} + ${LLFILESYSTEM_LIBRARIES} ${LLMATH_LIBRARIES} ${LLCOMMON_LIBRARIES} ${EXPAT_LIBRARIES} |