aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra')
-rw-r--r--linden/indra/cmake/JPEG.cmake9
1 files changed, 1 insertions, 8 deletions
diff --git a/linden/indra/cmake/JPEG.cmake b/linden/indra/cmake/JPEG.cmake
index 8a0456b..69e0769 100644
--- a/linden/indra/cmake/JPEG.cmake
+++ b/linden/indra/cmake/JPEG.cmake
@@ -12,14 +12,7 @@ else (STANDALONE)
12 if (LINUX) 12 if (LINUX)
13 set(JPEG_LIBRARIES jpeg) 13 set(JPEG_LIBRARIES jpeg)
14 elseif (DARWIN) 14 elseif (DARWIN)
15 find_library(JPEG_LIBRARIES 15 set(JPEG_LIBRARIES jpeg.62)
16 NAMES jpeg.62
17 PATHS ${ARCH_PREBUILT_DIRS_RELEASE}
18 )
19 if (NOT JPEG_LIBRARIES)
20 message(STATUS "WARNING: libjpeg.62.dylib not found! Falling back to -ljpeg. This might potentially link to the wrong libjpeg.")
21 set(JPEG_LIBRARIES jpeg)
22 endif (NOT JPEG_LIBRARIES)
23 elseif (WINDOWS) 16 elseif (WINDOWS)
24 set(JPEG_LIBRARIES jpeglib) 17 set(JPEG_LIBRARIES jpeglib)
25 endif (LINUX) 18 endif (LINUX)