diff options
author | Nemurimasu Neiro | 2010-09-13 16:40:16 +0000 |
---|---|---|
committer | McCabe Maxsted | 2010-09-13 14:35:15 -0700 |
commit | 7d0984f71e9bdfc1502a20d928e89d11e148b6a1 (patch) | |
tree | c293e28ddf419a86e74988a273894ba87c63f940 | |
parent | Restored the alt-H shortcut for teleport history (diff) | |
download | meta-impy-7d0984f71e9bdfc1502a20d928e89d11e148b6a1.zip meta-impy-7d0984f71e9bdfc1502a20d928e89d11e148b6a1.tar.gz meta-impy-7d0984f71e9bdfc1502a20d928e89d11e148b6a1.tar.bz2 meta-impy-7d0984f71e9bdfc1502a20d928e89d11e148b6a1.tar.xz |
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.
-rw-r--r-- | linden/indra/cmake/JPEG.cmake | 6 | ||||
-rw-r--r-- | linden/indra/cmake/OPENAL.cmake | 8 |
2 files changed, 4 insertions, 10 deletions
diff --git a/linden/indra/cmake/JPEG.cmake b/linden/indra/cmake/JPEG.cmake index de9667e..144f913 100644 --- a/linden/indra/cmake/JPEG.cmake +++ b/linden/indra/cmake/JPEG.cmake | |||
@@ -12,11 +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 ${ARCH_PREBUILT_DIRS_RELEASE}/libjpeg.62.dylib) |
16 | NAMES jpeg.62 | ||
17 | PATHS ${ARCH_PREBUILT_DIRS_RELEASE} | ||
18 | NO_DEFAULT_PATH | ||
19 | ) | ||
20 | elseif (WINDOWS) | 16 | elseif (WINDOWS) |
21 | set(JPEG_LIBRARIES jpeglib) | 17 | set(JPEG_LIBRARIES jpeglib) |
22 | endif (LINUX) | 18 | endif (LINUX) |
diff --git a/linden/indra/cmake/OPENAL.cmake b/linden/indra/cmake/OPENAL.cmake index 0ac9fb2..4f0e0cc 100644 --- a/linden/indra/cmake/OPENAL.cmake +++ b/linden/indra/cmake/OPENAL.cmake | |||
@@ -21,11 +21,9 @@ if (OPENAL) | |||
21 | 21 | ||
22 | elseif (DARWIN) | 22 | elseif (DARWIN) |
23 | # Look for for system's OpenAL.framework | 23 | # Look for for system's OpenAL.framework |
24 | find_library(OPENAL_LIB | 24 | # Nemu: This code has never looked for the system's OpenAL.framework |
25 | NAMES openal.1 | 25 | # Nemu: should it? |
26 | PATHS ${ARCH_PREBUILT_DIRS_RELEASE} | 26 | set(OPENAL_LIB ${ARCH_PREBUILT_DIRS_RELEASE}/libopenal.1.dylib) |
27 | NO_DEFAULT_PATH | ||
28 | ) | ||
29 | else (WINDOWS) | 27 | else (WINDOWS) |
30 | set(OPENAL_LIB openal) | 28 | set(OPENAL_LIB openal) |
31 | endif (WINDOWS) | 29 | endif (WINDOWS) |