diff options
| author | Euclid Linden <euclid@lindenlab.com> | 2021-03-02 22:04:37 +0000 |
|---|---|---|
| committer | Euclid Linden <euclid@lindenlab.com> | 2021-03-02 22:04:37 +0000 |
| commit | 9fdd1582774a928242b7fec91bbd951b123296e8 (patch) | |
| tree | 600cd078a00e80a33504c748540e333a34a4b30d /indra/llinventory/CMakeLists.txt | |
| parent | 31bca613a6011f5e1a95cffafd283e445142557f (diff) | |
| parent | 363bc9d9d0fe4f42b0dfbdb7adeb9a481a4fe55b (diff) | |
Merged in DV525-merge-6.4.15 (pull request #483)
DRTVWR-525 merge up to 6.4.15
Diffstat (limited to 'indra/llinventory/CMakeLists.txt')
| -rw-r--r-- | indra/llinventory/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llinventory/CMakeLists.txt b/indra/llinventory/CMakeLists.txt index e829788c91..04975940aa 100644 --- a/indra/llinventory/CMakeLists.txt +++ b/indra/llinventory/CMakeLists.txt @@ -7,7 +7,7 @@ include(LLCommon) include(LLCoreHttp) include(LLMath) include(LLMessage) -include(LLVFS) +include(LLFileSystem) include(LLXML) include_directories( @@ -81,7 +81,7 @@ if (LL_TESTS) LL_ADD_PROJECT_UNIT_TESTS(llinventory "${llinventory_TEST_SOURCE_FILES}") #set(TEST_DEBUG on) - set(test_libs llinventory ${LLMESSAGE_LIBRARIES} ${LLVFS_LIBRARIES} ${LLCOREHTTP_LIBRARIES} ${LLMATH_LIBRARIES} ${LLCOMMON_LIBRARIES} ${WINDOWS_LIBRARIES}) + set(test_libs llinventory ${LLMESSAGE_LIBRARIES} ${LLFILESYSTEM_LIBRARIES} ${LLCOREHTTP_LIBRARIES} ${LLMATH_LIBRARIES} ${LLCOMMON_LIBRARIES} ${WINDOWS_LIBRARIES}) LL_ADD_INTEGRATION_TEST(inventorymisc "" "${test_libs}") LL_ADD_INTEGRATION_TEST(llparcel "" "${test_libs}") endif (LL_TESTS) |