From e38bc6eb4df6d951dac5b496566b9f03668cd203 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Thu, 16 Sep 2010 20:53:09 -0500
Subject: Added a fallback for CMake JPEG_LIBRARIES on Mac.

---
 linden/indra/cmake/JPEG.cmake | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'linden/indra')

diff --git a/linden/indra/cmake/JPEG.cmake b/linden/indra/cmake/JPEG.cmake
index de9667e..8a0456b 100644
--- a/linden/indra/cmake/JPEG.cmake
+++ b/linden/indra/cmake/JPEG.cmake
@@ -15,8 +15,11 @@ else (STANDALONE)
     find_library(JPEG_LIBRARIES
       NAMES jpeg.62
       PATHS ${ARCH_PREBUILT_DIRS_RELEASE}
-      NO_DEFAULT_PATH
       )
+    if (NOT JPEG_LIBRARIES)
+      message(STATUS "WARNING: libjpeg.62.dylib not found! Falling back to -ljpeg. This might potentially link to the wrong libjpeg.")
+      set(JPEG_LIBRARIES jpeg)
+    endif (NOT JPEG_LIBRARIES)
   elseif (WINDOWS)
     set(JPEG_LIBRARIES jpeglib)
   endif (LINUX)
-- 
cgit v1.1