summaryrefslogtreecommitdiff
path: root/indra/llrender
diff options
context:
space:
mode:
authorDave Houlton <euclid@lindenlab.com>2021-12-15 13:05:02 -0700
committerDave Houlton <euclid@lindenlab.com>2021-12-15 13:05:02 -0700
commite27f9551e1cae0f3fca22989bcbd256a876fd80d (patch)
tree0361f80565053ec2183277eeb73c6c6dbf8d06f6 /indra/llrender
parent101e282ca3d0e8ca0bf10b32a2a4b6362bc66b80 (diff)
parent0a873cd95547f003878c6d00d0883ff792f4a865 (diff)
DRTVWR-528 merge up to 6.5.2
Diffstat (limited to 'indra/llrender')
-rw-r--r--indra/llrender/CMakeLists.txt12
1 files changed, 4 insertions, 8 deletions
diff --git a/indra/llrender/CMakeLists.txt b/indra/llrender/CMakeLists.txt
index 47e7ad915b..baab09a104 100644
--- a/indra/llrender/CMakeLists.txt
+++ b/indra/llrender/CMakeLists.txt
@@ -9,10 +9,9 @@ include(LLCommon)
include(LLImage)
include(LLMath)
include(LLRender)
-include(LLVFS)
include(LLWindow)
include(LLXML)
-include(LLVFS)
+include(LLFileSystem)
include_directories(
${FREETYPE_INCLUDE_DIRS}
@@ -20,10 +19,9 @@ include_directories(
${LLIMAGE_INCLUDE_DIRS}
${LLMATH_INCLUDE_DIRS}
${LLRENDER_INCLUDE_DIRS}
- ${LLVFS_INCLUDE_DIRS}
+ ${LLFILESYSTEM_INCLUDE_DIRS}
${LLWINDOW_INCLUDE_DIRS}
${LLXML_INCLUDE_DIRS}
- ${LLVFS_INCLUDE_DIRS}
)
include_directories(SYSTEM
${LLCOMMON_SYSTEM_INCLUDE_DIRS}
@@ -104,9 +102,8 @@ if (BUILD_HEADLESS)
${LLIMAGE_LIBRARIES}
${LLMATH_LIBRARIES}
${LLRENDER_HEADLESS_LIBRARIES}
- ${LLVFS_LIBRARIES}
${LLXML_LIBRARIES}
- ${LLVFS_LIBRARIES}
+ ${LLFILESYSTEM_LIBRARIES}
${LLWINDOW_HEADLESS_LIBRARIES}
${OPENGL_HEADLESS_LIBRARIES})
@@ -126,9 +123,8 @@ target_link_libraries(llrender
${LLCOMMON_LIBRARIES}
${LLIMAGE_LIBRARIES}
${LLMATH_LIBRARIES}
- ${LLVFS_LIBRARIES}
+ ${LLFILESYSTEM_LIBRARIES}
${LLXML_LIBRARIES}
- ${LLVFS_LIBRARIES}
${LLWINDOW_LIBRARIES}
${FREETYPE_LIBRARIES}
${OPENGL_LIBRARIES})