[Cmake-commits] CMake branch, next, updated. v2.8.12-4848-gff8c497

[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  ff8c497415f72025c8c627c84556813a90ea4875 (commit)
       via  cde56c1223dd50d57757f03575e5e642925059f3 (commit)
      from  cd64cb070608961ca65e4fb72ccdc33a7e14ce3b (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=ff8c497415f72025c8c627c84556813a90ea4875
commit ff8c497415f72025c8c627c84556813a90ea4875
Merge: cd64cb0 cde56c1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 4 08:56:27 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 4 08:56:27 2013 -0500

    Merge topic 'FindJNI-biarch' into next
    
    cde56c1 FindJNI: Support biarch installations (#14541)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cde56c1223dd50d57757f03575e5e642925059f3
commit cde56c1223dd50d57757f03575e5e642925059f3
Author:     Modestas Vainius <modax at debian.org>
AuthorDate: Mon Nov 4 08:55:02 2013 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 4 08:55:02 2013 -0500

    FindJNI: Support biarch installations (#14541)
    
    On biarch architecture, CMAKE_SYSTEM_PROCESSOR might be a 64bit one
    while the system 32bit one. Take this into consideration while looking
    for Java library directory.
    
    Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=718290

diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake
index 1780a8e..29a247d 100644
--- a/Modules/FindJNI.cmake
+++ b/Modules/FindJNI.cmake
@@ -39,7 +39,7 @@ macro(java_append_library_directories _var)
     # 1.6.0_18 + icedtea patches. However, it would be much better to base the
     # guess on the first part of the GNU config.guess platform triplet.
     if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-        set(_java_libarch "amd64")
+        set(_java_libarch "amd64" "i386")
     elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^i.86$")
         set(_java_libarch "i386")
     elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^alpha")
@@ -52,7 +52,7 @@ macro(java_append_library_directories _var)
         # endianess of the underlying system.
         set(_java_libarch "${CMAKE_SYSTEM_PROCESSOR}" "mips" "mipsel" "mipseb")
     elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64")
-        set(_java_libarch "ppc64")
+        set(_java_libarch "ppc64" "ppc")
     elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)")
         set(_java_libarch "ppc")
     elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^sparc")

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

Summary of changes:
 Modules/FindJNI.cmake |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake