From 3fc07dea01795b31c37dcd093ec73d190a1e188a Mon Sep 17 00:00:00 2001 From: Callum Prentice Date: Wed, 16 Sep 2020 18:53:24 -0700 Subject: First part of change to remove LLVFS from the Viewer. Consists of code changes to remove LLVFS and LLVFSThread classes along with the associated source files. The existing llvfs folder is renamed to llcache. Also includes changes to CMake script in many places to reflect changes. Eventually, llvfile source file and class will be renamed but that is not in this change. --- indra/cmake/CMakeLists.txt | 2 +- indra/cmake/LLCache.cmake | 7 +++++++ indra/cmake/LLVFS.cmake | 7 ------- 3 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 indra/cmake/LLCache.cmake delete mode 100644 indra/cmake/LLVFS.cmake (limited to 'indra/cmake') diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt index a17e37cd32..d464c8ad74 100644 --- a/indra/cmake/CMakeLists.txt +++ b/indra/cmake/CMakeLists.txt @@ -69,7 +69,7 @@ set(cmake_SOURCE_FILES LLSharedLibs.cmake LLTestCommand.cmake LLUI.cmake - LLVFS.cmake + LLCache.cmake LLWindow.cmake LLXML.cmake Linking.cmake diff --git a/indra/cmake/LLCache.cmake b/indra/cmake/LLCache.cmake new file mode 100644 index 0000000000..6a82774133 --- /dev/null +++ b/indra/cmake/LLCache.cmake @@ -0,0 +1,7 @@ +# -*- cmake -*- + +set(LLCACHE_INCLUDE_DIRS + ${LIBS_OPEN_DIR}/llcache + ) + +set(LLCACHE_LIBRARIES llcache) diff --git a/indra/cmake/LLVFS.cmake b/indra/cmake/LLVFS.cmake deleted file mode 100644 index 0fe87cdea6..0000000000 --- a/indra/cmake/LLVFS.cmake +++ /dev/null @@ -1,7 +0,0 @@ -# -*- cmake -*- - -set(LLVFS_INCLUDE_DIRS - ${LIBS_OPEN_DIR}/llvfs - ) - -set(LLVFS_LIBRARIES llvfs) -- cgit v1.2.3