From 6054b31b55649768542a104da728d3b9b3e13992 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Sun, 3 Oct 2010 11:04:44 -0500
Subject: Fixed (again) how libjpeg is found on Mac. (#256/#464)

Related information from Nemurimasu Neiro:

  stay away from find_library!

  due to an undocumented feature of find_xxx functions in CMake, no
  additional libraries may be found after the first call to a find_xxx
  function that searches the prebuilt libraries folder. CMake will request
  the folder contents *at most once* and libraries added by install.py
  will be missed.
---
 linden/indra/cmake/JPEG.cmake | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'linden/indra')

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)
   if (LINUX)
     set(JPEG_LIBRARIES jpeg)
   elseif (DARWIN)
-    find_library(JPEG_LIBRARIES
-      NAMES jpeg.62
-      PATHS ${ARCH_PREBUILT_DIRS_RELEASE}
-      )
-    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)
+    set(JPEG_LIBRARIES jpeg.62)
   elseif (WINDOWS)
     set(JPEG_LIBRARIES jpeglib)
   endif (LINUX)
-- 
cgit v1.1