From 778067728c6cf1acf55586821ad5ef517165c17d 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'linden/indra') diff --git a/linden/indra/cmake/JPEG.cmake b/linden/indra/cmake/JPEG.cmake index 144f913..69e0769 100644 --- a/linden/indra/cmake/JPEG.cmake +++ b/linden/indra/cmake/JPEG.cmake @@ -12,7 +12,7 @@ else (STANDALONE) if (LINUX) set(JPEG_LIBRARIES jpeg) elseif (DARWIN) - set(JPEG_LIBRARIES ${ARCH_PREBUILT_DIRS_RELEASE}/libjpeg.62.dylib) + set(JPEG_LIBRARIES jpeg.62) elseif (WINDOWS) set(JPEG_LIBRARIES jpeglib) endif (LINUX) -- cgit v1.1