diff options
| author | Philip Lowman <philip@yhbt.com> | 2012-08-18 21:03:18 (GMT) |
|---|---|---|
| committer | Philip Lowman <philip@yhbt.com> | 2012-08-18 21:03:18 (GMT) |
| commit | dd60ed2f4f523fecf2d9757d6b52f2bd0fa2bfac (patch) | |
| tree | 545c6a617961946c3e3a2b6b8d14a3692ea9654c /Modules/FindOpenAL.cmake | |
| parent | 224b5dea785d20a9054a2b7fb9e737c106084879 (diff) | |
| parent | cfe4ac4b417b80fb657c8de3b43a29e12a558d82 (diff) | |
| download | CMake-dd60ed2f4f523fecf2d9757d6b52f2bd0fa2bfac.zip CMake-dd60ed2f4f523fecf2d9757d6b52f2bd0fa2bfac.tar.gz CMake-dd60ed2f4f523fecf2d9757d6b52f2bd0fa2bfac.tar.bz2 | |
Merge topic 'lib64-cleanup' into FindOpenSceneGraph_13094
Resolved a few conflicts due to changes made in 13094 to paths
Conflicts:
Modules/FindOpenThreads.cmake
Modules/Findosg_functions.cmake
Diffstat (limited to 'Modules/FindOpenAL.cmake')
| -rw-r--r-- | Modules/FindOpenAL.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/FindOpenAL.cmake b/Modules/FindOpenAL.cmake index 311a11a..78fd632 100644 --- a/Modules/FindOpenAL.cmake +++ b/Modules/FindOpenAL.cmake @@ -63,7 +63,7 @@ find_path(OPENAL_INCLUDE_DIR al.h HINTS - $ENV{OPENALDIR} + ENV OPENALDIR PATH_SUFFIXES include/AL include/OpenAL include PATHS ~/Library/Frameworks @@ -78,7 +78,7 @@ find_path(OPENAL_INCLUDE_DIR al.h find_library(OPENAL_LIBRARY NAMES OpenAL al openal OpenAL32 HINTS - $ENV{OPENALDIR} + ENV OPENALDIR PATH_SUFFIXES lib64 lib libs64 libs libs/Win32 libs/Win64 PATHS ~/Library/Frameworks |