[Cmake-commits] CMake branch, next, updated. v3.1.0-2169-g9a96401

[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  9a96401774c4afc6bc12cde06cf6d6306b2f5b22 (commit)
       via  48984958192029f57338f511885eed85d1963f94 (commit)
      from  4703cca3e907970b2de37a75c7eac023cf40d61e (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9a96401774c4afc6bc12cde06cf6d6306b2f5b22
commit 9a96401774c4afc6bc12cde06cf6d6306b2f5b22
Merge: 4703cca 4898495
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 19 10:49:29 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 19 10:49:29 2015 -0500

    Merge topic 'find-package-mode-fix-multiarch' into next
    
    48984958 CMakeFindPackageMode: Fix Debian multiarch default guess (#15250)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=48984958192029f57338f511885eed85d1963f94
commit 48984958192029f57338f511885eed85d1963f94
Author:     Felix Geyer <debfx at ubuntu.com>
AuthorDate: Mon Jan 19 10:39:21 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 19 10:45:32 2015 -0500

    CMakeFindPackageMode: Fix Debian multiarch default guess (#15250)
    
    In commit v2.8.6~102^2~18 (Better support for lib64 and Debian
    multiarch, 2011-07-14) variable names "..._LANGUAGE_ARCHITECTURE" were
    set instead of the correct "..._LIBRARY_ARCHITECTURE".  Fix this typo
    and also set the language-independent variable
    CMAKE_LIBRARY_ARCHITECTURE.

diff --git a/Modules/CMakeFindPackageMode.cmake b/Modules/CMakeFindPackageMode.cmake
index fc3058d..26731dc 100644
--- a/Modules/CMakeFindPackageMode.cmake
+++ b/Modules/CMakeFindPackageMode.cmake
@@ -102,15 +102,18 @@ if(UNIX)
 
   # guess Debian multiarch if it has not been set:
   if(EXISTS /etc/debian_version)
-    if(NOT CMAKE_${LANGUAGE}_LANGUAGE_ARCHITECTURE )
+    if(NOT CMAKE_${LANGUAGE}_LIBRARY_ARCHITECTURE )
       file(GLOB filesInLib RELATIVE /lib /lib/*-linux-gnu* )
       foreach(file ${filesInLib})
         if("${file}" MATCHES "${CMAKE_LIBRARY_ARCHITECTURE_REGEX}")
-          set(CMAKE_${LANGUAGE}_LANGUAGE_ARCHITECTURE ${file})
+          set(CMAKE_${LANGUAGE}_LIBRARY_ARCHITECTURE ${file})
           break()
         endif()
       endforeach()
     endif()
+    if(NOT CMAKE_LIBRARY_ARCHITECTURE)
+      set(CMAKE_LIBRARY_ARCHITECTURE ${CMAKE_${LANGUAGE}_LIBRARY_ARCHITECTURE})
+    endif()
   endif()
 
 endif()

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

Summary of changes:
 Modules/CMakeFindPackageMode.cmake |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake