[Cmake-commits] CMake branch, next, updated. v3.6.2-2544-gf1a15af

[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  f1a15af9af00486f927870f149b4e30f185b64e4 (commit)
       via  59eb75d9d2b538f3b1810635f193366e9aeef5d1 (commit)
      from  ec9b84d509dfb3e9b7ea0e7bb358c3fb3d2f722d (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=f1a15af9af00486f927870f149b4e30f185b64e4
commit f1a15af9af00486f927870f149b4e30f185b64e4
Merge: ec9b84d 59eb75d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Sep 27 08:32:17 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Sep 27 08:32:17 2016 -0400

    Merge topic 'findjni' into next
    
    59eb75d9 FindJNI: Add aarch32 path on arm


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=59eb75d9d2b538f3b1810635f193366e9aeef5d1
commit 59eb75d9d2b538f3b1810635f193366e9aeef5d1
Author:     Orion Poplawski <orion at cora.nwra.com>
AuthorDate: Mon Sep 26 21:32:24 2016 -0600
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Sep 27 08:31:02 2016 -0400

    FindJNI: Add aarch32 path on arm

diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake
index 658d6ca..285b965 100644
--- a/Modules/FindJNI.cmake
+++ b/Modules/FindJNI.cmake
@@ -53,7 +53,7 @@ macro(java_append_library_directories _var)
         set(_java_libarch "alpha")
     elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
         # Subdir is "arm" for both big-endian (arm) and little-endian (armel).
-        set(_java_libarch "arm")
+        set(_java_libarch "arm" "aarch32")
     elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^mips")
         # mips* machines are bi-endian mostly so processor does not tell
         # endianess of the underlying system.

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

Summary of changes:
 Modules/FindJNI.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake