diff options
| author | Rye Mutt <rye@alchemyviewer.org> | 2024-08-02 06:25:39 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-02 13:25:39 +0300 |
| commit | 68ad61f6f5b6d7e980dd257102e66b7e010604fa (patch) | |
| tree | 68641895f276b70fd85149adc5de71d1261160f0 /indra/cmake | |
| parent | daa240164d8a639abf5a2a227b5e3a7723bacb5b (diff) | |
Update from jpeglib to libjpeg-turbo 3.0.3 (#2161, #2173)
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/JPEG.cmake | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/indra/cmake/JPEG.cmake b/indra/cmake/JPEG.cmake index 252d7852d4..ade5a070cc 100644 --- a/indra/cmake/JPEG.cmake +++ b/indra/cmake/JPEG.cmake @@ -7,12 +7,14 @@ include_guard() add_library( ll::libjpeg INTERFACE IMPORTED ) use_system_binary(libjpeg) -use_prebuilt_binary(jpeglib) +use_prebuilt_binary(libjpeg-turbo) if (LINUX) - target_link_libraries( ll::libjpeg INTERFACE jpeg) + target_link_libraries( ll::libjpeg INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libjpeg.a) elseif (DARWIN) - target_link_libraries( ll::libjpeg INTERFACE jpeg) + target_link_libraries( ll::libjpeg INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libjpeg.a) elseif (WINDOWS) - target_link_libraries( ll::libjpeg INTERFACE jpeglib) + target_link_libraries( ll::libjpeg INTERFACE + debug ${ARCH_PREBUILT_DIRS_DEBUG}/jpeg.lib + optimized ${ARCH_PREBUILT_DIRS_RELEASE}/jpeg.lib) endif (LINUX) target_include_directories( ll::libjpeg SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include) |