diff options
author | Euclid Linden <euclid@lindenlab.com> | 2021-03-02 22:41:49 +0000 |
---|---|---|
committer | Euclid Linden <euclid@lindenlab.com> | 2021-03-02 22:41:49 +0000 |
commit | a0b9fd6eb0dacfec30df0caac8dbbd7c25366c72 (patch) | |
tree | 229a96783c6534a36ce48bdb83108ce26ac24b2f /indra/llimage/CMakeLists.txt | |
parent | 2cad61d76ba48fe2adfda120bc21ca66166b7385 (diff) | |
parent | 10241c5596402a145e4087c36014d84507183c32 (diff) |
Merged in DV528-merge-6.4.15 (pull request #484)
DRTVWR-528 merge up to 6.4.15
Diffstat (limited to 'indra/llimage/CMakeLists.txt')
-rw-r--r-- | indra/llimage/CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llimage/CMakeLists.txt b/indra/llimage/CMakeLists.txt index 293ada7548..dc8e9f7c2f 100644 --- a/indra/llimage/CMakeLists.txt +++ b/indra/llimage/CMakeLists.txt @@ -6,7 +6,7 @@ include(00-Common) include(LLCommon) include(LLImage) include(LLMath) -include(LLVFS) +include(LLFileSystem) include(LLKDU) include(LLImageJ2COJ) include(ZLIB) @@ -17,7 +17,7 @@ include_directories( ${LLCOMMON_INCLUDE_DIRS} ${LLCOMMON_SYSTEM_INCLUDE_DIRS} ${LLMATH_INCLUDE_DIRS} - ${LLVFS_INCLUDE_DIRS} + ${LLFILESYSTEM_INCLUDE_DIRS} ${PNG_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS} ) @@ -68,7 +68,7 @@ else (USE_KDU) endif (USE_KDU) target_link_libraries(llimage - ${LLVFS_LIBRARIES} + ${LLFILESYSTEM_LIBRARIES} ${LLMATH_LIBRARIES} ${LLCOMMON_LIBRARIES} ${JPEG_LIBRARIES} |