[Cmake-commits] CMake branch, next, updated. v3.3.1-2373-gd394212

[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  d394212a00197cb777c5cd5b2a887a4a909110eb (commit)
       via  c4d78b8bc05d44b8a46b5d2db6b52b42a101ef2d (commit)
      from  ac00a76e6a3cb80f1b91d7fbf3ca466ef9484908 (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=d394212a00197cb777c5cd5b2a887a4a909110eb
commit d394212a00197cb777c5cd5b2a887a4a909110eb
Merge: ac00a76 c4d78b8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Aug 24 11:07:20 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Aug 24 11:07:20 2015 -0400

    Merge topic 'FindJNI-linux-x32' into next
    
    c4d78b8b FindJNI: Add support for x32 architecture on Linux (#15710)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c4d78b8bc05d44b8a46b5d2db6b52b42a101ef2d
commit c4d78b8bc05d44b8a46b5d2db6b52b42a101ef2d
Author:     Thorsten Glaser <tg at mirbsd.de>
AuthorDate: Mon Aug 24 10:53:00 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Aug 24 10:54:13 2015 -0400

    FindJNI: Add support for x32 architecture on Linux (#15710)
    
    This architecture uses an amd64 kernel but x32 userland.
    Use CMAKE_LIBRARY_ARCHITECTURE to distinguish it for now.

diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake
index d248fe1..d31fea3 100644
--- a/Modules/FindJNI.cmake
+++ b/Modules/FindJNI.cmake
@@ -42,7 +42,11 @@ 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")
+      if(CMAKE_LIBRARY_ARCHITECTURE STREQUAL "x86_64-linux-gnux32")
+        set(_java_libarch "x32" "amd64" "i386")
+      else()
         set(_java_libarch "amd64" "i386")
+      endif()
     elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^i.86$")
         set(_java_libarch "i386")
     elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^alpha")

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

Summary of changes:
 Modules/FindJNI.cmake |    4 ++++
 1 file changed, 4 insertions(+)


hooks/post-receive
-- 
CMake