diff options
author | Nemurimasu Neiro | 2010-08-28 15:33:32 +0000 |
---|---|---|
committer | Jacek Antonelli | 2010-09-16 20:46:59 -0500 |
commit | 9593cebcf6c07897c37ff776a9c117bb9d097058 (patch) | |
tree | 9769e8ec2698c3c06c7007100b8deee3a0280b89 | |
parent | Listed http textures as '(experimental)' (diff) | |
download | meta-impy-9593cebcf6c07897c37ff776a9c117bb9d097058.zip meta-impy-9593cebcf6c07897c37ff776a9c117bb9d097058.tar.gz meta-impy-9593cebcf6c07897c37ff776a9c117bb9d097058.tar.bz2 meta-impy-9593cebcf6c07897c37ff776a9c117bb9d097058.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
-rw-r--r-- | linden/indra/cmake/JPEG.cmake | 6 |
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) |