diff options
author | Jacek Antonelli | 2010-10-03 11:04:44 -0500 |
---|---|---|
committer | Jacek Antonelli | 2010-10-03 11:04:44 -0500 |
commit | 6054b31b55649768542a104da728d3b9b3e13992 (patch) | |
tree | 1dfe88d951e8117aed836ba599a23813cd747cf3 /linden/indra/cmake | |
parent | Allow build under Mac OS X 10.6 SDK by removing deprecated things. (diff) | |
download | meta-impy-6054b31b55649768542a104da728d3b9b3e13992.zip meta-impy-6054b31b55649768542a104da728d3b9b3e13992.tar.gz meta-impy-6054b31b55649768542a104da728d3b9b3e13992.tar.bz2 meta-impy-6054b31b55649768542a104da728d3b9b3e13992.tar.xz |
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.
Diffstat (limited to 'linden/indra/cmake')
-rw-r--r-- | linden/indra/cmake/JPEG.cmake | 9 |
1 files changed, 1 insertions, 8 deletions
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) | |||
12 | if (LINUX) | 12 | if (LINUX) |
13 | set(JPEG_LIBRARIES jpeg) | 13 | set(JPEG_LIBRARIES jpeg) |
14 | elseif (DARWIN) | 14 | elseif (DARWIN) |
15 | find_library(JPEG_LIBRARIES | 15 | set(JPEG_LIBRARIES jpeg.62) |
16 | NAMES jpeg.62 | ||
17 | PATHS ${ARCH_PREBUILT_DIRS_RELEASE} | ||
18 | ) | ||
19 | if (NOT JPEG_LIBRARIES) | ||
20 | message(STATUS "WARNING: libjpeg.62.dylib not found! Falling back to -ljpeg. This might potentially link to the wrong libjpeg.") | ||
21 | set(JPEG_LIBRARIES jpeg) | ||
22 | endif (NOT JPEG_LIBRARIES) | ||
23 | elseif (WINDOWS) | 16 | elseif (WINDOWS) |
24 | set(JPEG_LIBRARIES jpeglib) | 17 | set(JPEG_LIBRARIES jpeglib) |
25 | endif (LINUX) | 18 | endif (LINUX) |