summaryrefslogtreecommitdiff
path: root/indra/cmake/JPEG.cmake
diff options
context:
space:
mode:
Diffstat (limited to 'indra/cmake/JPEG.cmake')
-rw-r--r--indra/cmake/JPEG.cmake9
1 files changed, 5 insertions, 4 deletions
diff --git a/indra/cmake/JPEG.cmake b/indra/cmake/JPEG.cmake
index 18bdd8bc46..9514d59f64 100644
--- a/indra/cmake/JPEG.cmake
+++ b/indra/cmake/JPEG.cmake
@@ -1,4 +1,5 @@
# -*- cmake -*-
+include(Prebuilt)
include(Linking)
set(JPEG_FIND_QUIETLY ON)
@@ -7,16 +8,16 @@ set(JPEG_FIND_REQUIRED ON)
if (STANDALONE)
include(FindJPEG)
else (STANDALONE)
+ use_prebuilt_binary(jpeglib)
if (LINUX)
set(JPEG_LIBRARIES jpeg)
elseif (DARWIN)
set(JPEG_LIBRARIES
- lljpeg
- optimized ${ARCH_PREBUILT_DIRS_RELEASE}/lljpeg
- debug ${ARCH_PREBUILT_DIRS_DEBUG}/lljpeg
+ optimized ${ARCH_PREBUILT_DIRS_RELEASE}/liblljpeg.a
+ debug ${ARCH_PREBUILT_DIRS_DEBUG}/liblljpeg.a
)
elseif (WINDOWS)
- set(JPEG_LIBRARIES jpeglib_6b)
+ set(JPEG_LIBRARIES jpeglib)
endif (LINUX)
set(JPEG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
endif (STANDALONE)