Navigation Menu

Skip to content

Commit

Permalink
stay away from find_library!
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
nemurimasu authored and adric committed Sep 13, 2010
1 parent 0b39dcf commit 7d0984f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 10 deletions.
6 changes: 1 addition & 5 deletions linden/indra/cmake/JPEG.cmake
Expand Up @@ -12,11 +12,7 @@ else (STANDALONE)
if (LINUX)
set(JPEG_LIBRARIES jpeg)
elseif (DARWIN)
find_library(JPEG_LIBRARIES
NAMES jpeg.62
PATHS ${ARCH_PREBUILT_DIRS_RELEASE}
NO_DEFAULT_PATH
)
set(JPEG_LIBRARIES ${ARCH_PREBUILT_DIRS_RELEASE}/libjpeg.62.dylib)
elseif (WINDOWS)
set(JPEG_LIBRARIES jpeglib)
endif (LINUX)
Expand Down
8 changes: 3 additions & 5 deletions linden/indra/cmake/OPENAL.cmake
Expand Up @@ -21,11 +21,9 @@ if (OPENAL)

elseif (DARWIN)
# Look for for system's OpenAL.framework
find_library(OPENAL_LIB
NAMES openal.1
PATHS ${ARCH_PREBUILT_DIRS_RELEASE}
NO_DEFAULT_PATH
)
# Nemu: This code has never looked for the system's OpenAL.framework
# Nemu: should it?
set(OPENAL_LIB ${ARCH_PREBUILT_DIRS_RELEASE}/libopenal.1.dylib)
else (WINDOWS)
set(OPENAL_LIB openal)
endif (WINDOWS)
Expand Down

0 comments on commit 7d0984f

Please sign in to comment.