diff options
author | Brad King <brad.king@kitware.com> | 2016-09-28 12:05:01 (GMT) |
---|---|---|
committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-09-28 12:05:01 (GMT) |
commit | a71a172ebf59ce997d971a45b707f7742f07d368 (patch) | |
tree | 2733045b471ca887bfcfa919be2300aa4550dd9c /Modules | |
parent | cd89d1998a3312887536451485609e8ab09181ef (diff) | |
parent | 59eb75d9d2b538f3b1810635f193366e9aeef5d1 (diff) | |
download | CMake-a71a172ebf59ce997d971a45b707f7742f07d368.zip CMake-a71a172ebf59ce997d971a45b707f7742f07d368.tar.gz CMake-a71a172ebf59ce997d971a45b707f7742f07d368.tar.bz2 |
Merge topic 'findjni'
59eb75d9 FindJNI: Add aarch32 path on arm
Diffstat (limited to 'Modules')
-rw-r--r-- | Modules/FindJNI.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
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. |