diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2021-03-10 09:54:54 -0700 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2021-03-10 09:59:41 -0700 |
| commit | f6ddd91dd6cb908e12cd6223273b3199675bcbe8 (patch) | |
| tree | 44bdbefda6a8638cd4e976f00456f37fcf597c5c /indra/test | |
| parent | a0b9fd6eb0dacfec30df0caac8dbbd7c25366c72 (diff) | |
| parent | 88d837c16e768c5262073a7df965066d4bd8842c (diff) | |
Merge branch 'master' v6.4.17 into DRTVWR-528
Diffstat (limited to 'indra/test')
| -rw-r--r-- | indra/test/CMakeLists.txt | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/test/CMakeLists.txt b/indra/test/CMakeLists.txt index b3bff3611a..87536e146b 100644 --- a/indra/test/CMakeLists.txt +++ b/indra/test/CMakeLists.txt @@ -8,11 +8,12 @@ include(LLCoreHttp) include(LLInventory) include(LLMath) include(LLMessage) -include(LLFileSystem) +include(LLVFS) include(LLXML) include(Linking) include(Tut) include(LLAddBuildTest) + include(GoogleMock) include_directories( @@ -22,7 +23,7 @@ include_directories( ${LLMATH_INCLUDE_DIRS} ${LLMESSAGE_INCLUDE_DIRS} ${LLINVENTORY_INCLUDE_DIRS} - ${LLFILESYSTEM_INCLUDE_DIRS} + ${LLVFS_INCLUDE_DIRS} ${LLXML_INCLUDE_DIRS} ${LSCRIPT_INCLUDE_DIRS} ${GOOGLEMOCK_INCLUDE_DIRS} @@ -88,7 +89,7 @@ target_link_libraries(lltest ${LLINVENTORY_LIBRARIES} ${LLMESSAGE_LIBRARIES} ${LLMATH_LIBRARIES} - ${LLFILESYSTEM_LIBRARIES} + ${LLVFS_LIBRARIES} ${LLXML_LIBRARIES} ${LSCRIPT_LIBRARIES} ${LLCOMMON_LIBRARIES} |