[Cmake-commits] CMake branch, next, updated. v3.4.1-1665-g2855238

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  28552384b40e9516073bcd099fd5f73679578c80 (commit)
       via  39abbaed7756ac9b4d1d2e7f44575ae85388aaf6 (commit)
      from  f447ad40b4a155f3501354857aaaaaa6cfb36d52 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=28552384b40e9516073bcd099fd5f73679578c80
commit 28552384b40e9516073bcd099fd5f73679578c80
Merge: f447ad4 39abbae
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 10 09:19:51 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Dec 10 09:19:51 2015 -0500

    Merge topic 'FindOpenAL-win-arch' into next
    
    39abbaed FindOpenAL: Detect Windows architecture-specific installation


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=39abbaed7756ac9b4d1d2e7f44575ae85388aaf6
commit 39abbaed7756ac9b4d1d2e7f44575ae85388aaf6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 10 09:14:54 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Dec 10 09:18:48 2015 -0500

    FindOpenAL: Detect Windows architecture-specific installation
    
    Some OpenAL implementations on Windows provide both Win32 and Win64
    binaries.  Search the location of the matching architecture.
    
    Author: George "Zogzer at GitHub" <insertlogic at gmail.com>

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

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindOpenAL.cmake |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake