diff options
| author | Callum Prentice <callum@lindenlab.com> | 2021-03-10 11:59:23 -0800 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2021-03-10 11:59:23 -0800 |
| commit | 45af049a479928208a1ad30a90c1db6be1969f9a (patch) | |
| tree | e40aabda6866b3ca163e0ffe86127fd49332278a /indra/test | |
| parent | b1add74c31cfd28c1e671470991254b4545fb573 (diff) | |
| parent | 88d837c16e768c5262073a7df965066d4bd8842c (diff) | |
Merge branch 'master' into DRTVWR-531
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} |