diff options
| author | Brad King <brad.king@kitware.com> | 2015-12-11 14:43:37 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-12-11 14:43:37 (GMT) |
| commit | 67afa4e407d133754cc2614b137311c35ef3dfca (patch) | |
| tree | 1772cb0d87d20f6e7401ed30d57155df56955e9e | |
| parent | 511e5dbd710af570d45488a48a1256724784b761 (diff) | |
| parent | 39abbaed7756ac9b4d1d2e7f44575ae85388aaf6 (diff) | |
| download | CMake-67afa4e407d133754cc2614b137311c35ef3dfca.zip CMake-67afa4e407d133754cc2614b137311c35ef3dfca.tar.gz CMake-67afa4e407d133754cc2614b137311c35ef3dfca.tar.bz2 | |
Merge topic 'FindOpenAL-win-arch'
39abbaed FindOpenAL: Detect Windows architecture-specific installation
| -rw-r--r-- | Modules/FindOpenAL.cmake | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Modules/FindOpenAL.cmake b/Modules/FindOpenAL.cmake index 8150ff2..eb63cef 100644 --- a/Modules/FindOpenAL.cmake +++ b/Modules/FindOpenAL.cmake @@ -79,11 +79,17 @@ find_path(OPENAL_INCLUDE_DIR al.h [HKEY_LOCAL_MACHINE\\SOFTWARE\\Creative\ Labs\\OpenAL\ 1.1\ Software\ Development\ Kit\\1.00.0000;InstallDir] ) +if(CMAKE_SIZEOF_VOID_P EQUAL 8) + set(_OpenAL_ARCH_DIR libs/Win64) +else() + set(_OpenAL_ARCH_DIR libs/Win32) +endif() + find_library(OPENAL_LIBRARY NAMES OpenAL al openal OpenAL32 HINTS ENV OPENALDIR - PATH_SUFFIXES lib64 lib libs64 libs libs/Win32 libs/Win64 + PATH_SUFFIXES lib64 lib libs64 libs ${_OpenAL_ARCH_DIR} PATHS ~/Library/Frameworks /Library/Frameworks @@ -94,6 +100,7 @@ find_library(OPENAL_LIBRARY [HKEY_LOCAL_MACHINE\\SOFTWARE\\Creative\ Labs\\OpenAL\ 1.1\ Software\ Development\ Kit\\1.00.0000;InstallDir] ) +unset(_OpenAL_ARCH_DIR) # handle the QUIETLY and REQUIRED arguments and set OPENAL_FOUND to TRUE if # all listed variables are TRUE |