From 9593cebcf6c07897c37ff776a9c117bb9d097058 Mon Sep 17 00:00:00 2001
From: Nemurimasu Neiro
Date: Sat, 28 Aug 2010 15:33:32 +0000
Subject: fix libjpeg linking on Mac OS

my custom builds were linking against /usr/local/lib/libjpeg.8.dylib and
causing a version mismatch error when trying to use JPEGs
---
 linden/indra/cmake/JPEG.cmake | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'linden/indra')

diff --git a/linden/indra/cmake/JPEG.cmake b/linden/indra/cmake/JPEG.cmake
index 4f99efd..de9667e 100644
--- a/linden/indra/cmake/JPEG.cmake
+++ b/linden/indra/cmake/JPEG.cmake
@@ -12,7 +12,11 @@ else (STANDALONE)
   if (LINUX)
     set(JPEG_LIBRARIES jpeg)
   elseif (DARWIN)
-    set(JPEG_LIBRARIES jpeg)
+    find_library(JPEG_LIBRARIES
+      NAMES jpeg.62
+      PATHS ${ARCH_PREBUILT_DIRS_RELEASE}
+      NO_DEFAULT_PATH
+      )
   elseif (WINDOWS)
     set(JPEG_LIBRARIES jpeglib)
   endif (LINUX)
-- 
cgit v1.1