diff options
| author | Jacek Antonelli | 2010-10-03 11:04:44 -0500 |
|---|---|---|
| committer | McCabe Maxsted | 2010-10-08 23:18:16 -0700 |
| commit | 778067728c6cf1acf55586821ad5ef517165c17d (patch) | |
| tree | 0fffbc2d60a3da4876fa1837758126786784f099 /linden | |
| parent | Updated source repo URL in README.txt. (diff) | |
| download | meta-impy-778067728c6cf1acf55586821ad5ef517165c17d.zip meta-impy-778067728c6cf1acf55586821ad5ef517165c17d.tar.gz meta-impy-778067728c6cf1acf55586821ad5ef517165c17d.tar.bz2 meta-impy-778067728c6cf1acf55586821ad5ef517165c17d.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')
| -rw-r--r-- | linden/indra/cmake/JPEG.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
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) | |||
| 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 ${ARCH_PREBUILT_DIRS_RELEASE}/libjpeg.62.dylib) | 15 | set(JPEG_LIBRARIES jpeg.62) |
| 16 | elseif (WINDOWS) | 16 | elseif (WINDOWS) |
| 17 | set(JPEG_LIBRARIES jpeglib) | 17 | set(JPEG_LIBRARIES jpeglib) |
| 18 | endif (LINUX) | 18 | endif (LINUX) |