From d9448c6f52218146113d1d5c5ca4c4d5f01dc5cf Mon Sep 17 00:00:00 2001 From: Callum Prentice Date: Thu, 17 Sep 2020 09:45:06 -0700 Subject: The folder where the disk cache lives was originally renamed from llvfs to llcache but @henri's suggestion that that doesn't reflect the other files in the same place and it should be llfilesystem is a good one so I changed it over --- indra/llfilesystem/CMakeLists.txt | 98 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) create mode 100644 indra/llfilesystem/CMakeLists.txt (limited to 'indra/llfilesystem/CMakeLists.txt') diff --git a/indra/llfilesystem/CMakeLists.txt b/indra/llfilesystem/CMakeLists.txt new file mode 100644 index 0000000000..4af14d6d3a --- /dev/null +++ b/indra/llfilesystem/CMakeLists.txt @@ -0,0 +1,98 @@ +# -*- cmake -*- + +project(llfilesystem) + +include(00-Common) +include(LLCommon) +include(UnixInstall) + +include_directories( + ${LLCOMMON_INCLUDE_DIRS} + ${LLCOMMON_SYSTEM_INCLUDE_DIRS} + ) + +set(llfilesystem_SOURCE_FILES + lldir.cpp + lldiriterator.cpp + lllfsthread.cpp + lldiskcache.cpp + ) + +set(llfilesystem_HEADER_FILES + CMakeLists.txt + + lldir.h + lldirguard.h + lldiriterator.h + lllfsthread.h + lldiskcache.h + ) + +if (DARWIN) + LIST(APPEND llfilesystem_SOURCE_FILES lldir_utils_objc.mm) + LIST(APPEND llfilesystem_SOURCE_FILES lldir_utils_objc.h) + LIST(APPEND llfilesystem_SOURCE_FILES lldir_mac.cpp) + LIST(APPEND llfilesystem_HEADER_FILES lldir_mac.h) +endif (DARWIN) + +if (LINUX) + LIST(APPEND llfilesystem_SOURCE_FILES lldir_linux.cpp) + LIST(APPEND llfilesystem_HEADER_FILES lldir_linux.h) + + if (INSTALL) + set_source_files_properties(lldir_linux.cpp + PROPERTIES COMPILE_FLAGS + "-DAPP_RO_DATA_DIR=\\\"${APP_SHARE_DIR}\\\"" + ) + endif (INSTALL) +endif (LINUX) + +if (WINDOWS) + LIST(APPEND llfilesystem_SOURCE_FILES lldir_win32.cpp) + LIST(APPEND llfilesystem_HEADER_FILES lldir_win32.h) +endif (WINDOWS) + +set_source_files_properties(${llfilesystem_HEADER_FILES} + PROPERTIES HEADER_FILE_ONLY TRUE) + +list(APPEND llfilesystem_SOURCE_FILES ${llfilesystem_HEADER_FILES}) + +add_library (llfilesystem ${llfilesystem_SOURCE_FILES}) + +set(cache_BOOST_LIBRARIES + ${BOOST_FILESYSTEM_LIBRARY} + ${BOOST_SYSTEM_LIBRARY} + ) + +target_link_libraries(llfilesystem + ${LLCOMMON_LIBRARIES} + ${cache_BOOST_LIBRARIES} + ) + +if (DARWIN) + include(CMakeFindFrameworks) + find_library(COCOA_LIBRARY Cocoa) + target_link_libraries(llfilesystem ${COCOA_LIBRARY}) +endif (DARWIN) + + +# Add tests +if (LL_TESTS) + include(LLAddBuildTest) + # UNIT TESTS + SET(llfilesystem_TEST_SOURCE_FILES + lldiriterator.cpp + ) + + set_source_files_properties(lldiriterator.cpp + PROPERTIES + LL_TEST_ADDITIONAL_LIBRARIES "${cache_BOOST_LIBRARIES}" + ) + LL_ADD_PROJECT_UNIT_TESTS(llfilesystem "${llfilesystem_TEST_SOURCE_FILES}") + + # INTEGRATION TESTS + set(test_libs llmath llcommon llfilesystem ${LLCOMMON_LIBRARIES} ${WINDOWS_LIBRARIES}) + + # TODO: Some of these need refactoring to be proper Unit tests rather than Integration tests. + LL_ADD_INTEGRATION_TEST(lldir "" "${test_libs}") +endif (LL_TESTS) -- cgit v1.2.3 From 5858bb87c7d9d222e61c7c4f7f0f1dc8ba02c77f Mon Sep 17 00:00:00 2001 From: Callum Prentice Date: Tue, 22 Sep 2020 16:52:10 -0700 Subject: Add SQLite third package to this viewer and pull in the most recent build (3.33) --- indra/llfilesystem/CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) (limited to 'indra/llfilesystem/CMakeLists.txt') diff --git a/indra/llfilesystem/CMakeLists.txt b/indra/llfilesystem/CMakeLists.txt index 4af14d6d3a..306b483097 100644 --- a/indra/llfilesystem/CMakeLists.txt +++ b/indra/llfilesystem/CMakeLists.txt @@ -4,11 +4,13 @@ project(llfilesystem) include(00-Common) include(LLCommon) +include(SQLite) include(UnixInstall) include_directories( ${LLCOMMON_INCLUDE_DIRS} ${LLCOMMON_SYSTEM_INCLUDE_DIRS} + ${SQLITE_INCLUDE_DIR} ) set(llfilesystem_SOURCE_FILES @@ -67,6 +69,7 @@ set(cache_BOOST_LIBRARIES target_link_libraries(llfilesystem ${LLCOMMON_LIBRARIES} ${cache_BOOST_LIBRARIES} + ${SQLITE_LIBRARIES} ) if (DARWIN) -- cgit v1.2.3 From 6be1f88a5ef99e1e40bb5701a250ba0728f56005 Mon Sep 17 00:00:00 2001 From: Callum Prentice Date: Thu, 24 Sep 2020 14:45:39 -0700 Subject: Complete the change from lldiskcache -> llfilesystem and then addition of new lldiskcache implementation --- indra/llfilesystem/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/llfilesystem/CMakeLists.txt') diff --git a/indra/llfilesystem/CMakeLists.txt b/indra/llfilesystem/CMakeLists.txt index 306b483097..d1dece5bba 100644 --- a/indra/llfilesystem/CMakeLists.txt +++ b/indra/llfilesystem/CMakeLists.txt @@ -18,16 +18,17 @@ set(llfilesystem_SOURCE_FILES lldiriterator.cpp lllfsthread.cpp lldiskcache.cpp + llfilesystem.cpp ) set(llfilesystem_HEADER_FILES CMakeLists.txt - lldir.h lldirguard.h lldiriterator.h lllfsthread.h lldiskcache.h + llfilesystem.h ) if (DARWIN) -- cgit v1.2.3 From 56e30615530bf5d1c86fbafee89c9998a079e88f Mon Sep 17 00:00:00 2001 From: Callum Prentice Date: Tue, 6 Oct 2020 17:20:08 -0700 Subject: Remove SQLite from project and we are now not going to use it for the cache --- indra/llfilesystem/CMakeLists.txt | 3 --- 1 file changed, 3 deletions(-) (limited to 'indra/llfilesystem/CMakeLists.txt') diff --git a/indra/llfilesystem/CMakeLists.txt b/indra/llfilesystem/CMakeLists.txt index d1dece5bba..09c4c33ebf 100644 --- a/indra/llfilesystem/CMakeLists.txt +++ b/indra/llfilesystem/CMakeLists.txt @@ -4,13 +4,11 @@ project(llfilesystem) include(00-Common) include(LLCommon) -include(SQLite) include(UnixInstall) include_directories( ${LLCOMMON_INCLUDE_DIRS} ${LLCOMMON_SYSTEM_INCLUDE_DIRS} - ${SQLITE_INCLUDE_DIR} ) set(llfilesystem_SOURCE_FILES @@ -70,7 +68,6 @@ set(cache_BOOST_LIBRARIES target_link_libraries(llfilesystem ${LLCOMMON_LIBRARIES} ${cache_BOOST_LIBRARIES} - ${SQLITE_LIBRARIES} ) if (DARWIN) -- cgit v1.2.3