diff options
| author | Callum Prentice <callum@lindenlab.com> | 2021-03-09 14:26:24 -0800 | 
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2021-03-09 14:26:24 -0800 | 
| commit | 519cbcecdf78e4dfc3adc465ae8cebed5df71647 (patch) | |
| tree | efa8e20856dbfc80e1ae44283cbd0139b828b1b2 /indra/integration_tests/llimage_libtest | |
| parent | ada8ad1bc21665631f030c3194a567ea6f6a2a72 (diff) | |
| parent | 88d837c16e768c5262073a7df965066d4bd8842c (diff) | |
Merge with master before reseting to revert (revert) and get back to D519 status
Diffstat (limited to 'indra/integration_tests/llimage_libtest')
| -rw-r--r-- | indra/integration_tests/llimage_libtest/CMakeLists.txt | 6 | 
1 files changed, 3 insertions, 3 deletions
| diff --git a/indra/integration_tests/llimage_libtest/CMakeLists.txt b/indra/integration_tests/llimage_libtest/CMakeLists.txt index bd59f57e49..5787d4d600 100644 --- a/indra/integration_tests/llimage_libtest/CMakeLists.txt +++ b/indra/integration_tests/llimage_libtest/CMakeLists.txt @@ -10,11 +10,11 @@ include(LLImage)  include(LLMath)  include(LLImageJ2COJ)   include(LLKDU) -include(LLFileSystem) +include(LLVFS)  include_directories(      ${LLCOMMON_INCLUDE_DIRS} -    ${LLFILESYSTEM_INCLUDE_DIRS} +    ${LLVFS_INCLUDE_DIRS}      ${LLIMAGE_INCLUDE_DIRS}      ${LLMATH_INCLUDE_DIRS}      ) @@ -66,7 +66,7 @@ endif (DARWIN)  target_link_libraries(llimage_libtest      ${LEGACY_STDIO_LIBS}      ${LLCOMMON_LIBRARIES} -    ${LLFILESYSTEM_LIBRARIES} +    ${LLVFS_LIBRARIES}      ${LLMATH_LIBRARIES}      ${LLIMAGE_LIBRARIES}      ${LLKDU_LIBRARIES} | 
