aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/cmake/JPEG.cmake
diff options
context:
space:
mode:
authorNemurimasu Neiro2010-08-28 15:33:32 +0000
committerMcCabe Maxsted2010-09-02 14:12:56 -0700
commit1bdcdfab1051cf7eccc488ea43f7f5f11a5447c8 (patch)
treee93fdd3d85ed08915b2f4f99b4d65a2800a94afb /linden/indra/cmake/JPEG.cmake
parentAdded license info for hunspell to install.xml (diff)
downloadmeta-impy-1bdcdfab1051cf7eccc488ea43f7f5f11a5447c8.zip
meta-impy-1bdcdfab1051cf7eccc488ea43f7f5f11a5447c8.tar.gz
meta-impy-1bdcdfab1051cf7eccc488ea43f7f5f11a5447c8.tar.bz2
meta-impy-1bdcdfab1051cf7eccc488ea43f7f5f11a5447c8.tar.xz
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
Diffstat (limited to '')
-rw-r--r--linden/indra/cmake/JPEG.cmake6
1 files changed, 5 insertions, 1 deletions
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)
12 if (LINUX) 12 if (LINUX)
13 set(JPEG_LIBRARIES jpeg) 13 set(JPEG_LIBRARIES jpeg)
14 elseif (DARWIN) 14 elseif (DARWIN)
15 set(JPEG_LIBRARIES jpeg) 15 find_library(JPEG_LIBRARIES
16 NAMES jpeg.62
17 PATHS ${ARCH_PREBUILT_DIRS_RELEASE}
18 NO_DEFAULT_PATH
19 )
16 elseif (WINDOWS) 20 elseif (WINDOWS)
17 set(JPEG_LIBRARIES jpeglib) 21 set(JPEG_LIBRARIES jpeglib)
18 endif (LINUX) 22 endif (LINUX)