diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-03-09 21:58:57 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-03-09 21:58:57 +0200 |
| commit | 1fe0033a7e8dc2b68fb1e5a25144fa0bc719b1af (patch) | |
| tree | 0a4c8381d5815663f6bc84488f5945c27f6f8080 /indra/newview/CMakeLists.txt | |
| parent | 4f55a14f8281e7cccfa5c6980ad77921cb5ebdd8 (diff) | |
| parent | 88d837c16e768c5262073a7df965066d4bd8842c (diff) | |
Merge branch 'master' into DRTVWR-483
Diffstat (limited to 'indra/newview/CMakeLists.txt')
| -rw-r--r-- | indra/newview/CMakeLists.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 2f17e4eeec..1efa4e6c23 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -39,7 +39,7 @@ include(LLPlugin) include(LLPrimitive) include(LLRender) include(LLUI) -include(LLFileSystem) +include(LLVFS) include(LLWindow) include(LLXML) include(NDOF) @@ -84,7 +84,7 @@ include_directories( ${LLPRIMITIVE_INCLUDE_DIRS} ${LLRENDER_INCLUDE_DIRS} ${LLUI_INCLUDE_DIRS} - ${LLFILESYSTEM_INCLUDE_DIRS} + ${LLVFS_INCLUDE_DIRS} ${LLWINDOW_INCLUDE_DIRS} ${LLXML_INCLUDE_DIRS} ${LLLOGIN_INCLUDE_DIRS} @@ -2020,7 +2020,7 @@ target_link_libraries(${VIEWER_BINARY_NAME} ${LLRENDER_LIBRARIES} ${FREETYPE_LIBRARIES} ${LLUI_LIBRARIES} - ${LLFILESYSTEM_LIBRARIES} + ${LLVFS_LIBRARIES} ${LLWINDOW_LIBRARIES} ${LLXML_LIBRARIES} ${LLMATH_LIBRARIES} @@ -2496,7 +2496,7 @@ if (LL_TESTS) set(test_libs ${LLMESSAGE_LIBRARIES} ${WINDOWS_LIBRARIES} - ${LLFILESYSTEM_LIBRARIES} + ${LLVFS_LIBRARIES} ${LLMATH_LIBRARIES} ${LLCOMMON_LIBRARIES} ${GOOGLEMOCK_LIBRARIES} @@ -2511,7 +2511,7 @@ if (LL_TESTS) set(test_libs ${WINDOWS_LIBRARIES} - ${LLFILESYSTEM_LIBRARIES} + ${LLVFS_LIBRARIES} ${LLMATH_LIBRARIES} ${LLCOMMON_LIBRARIES} ${LLMESSAGE_LIBRARIES} |