Merge topic 'findjni'

59eb75d9 FindJNI: Add aarch32 path on arm
This commit is contained in:
Brad King 2016-09-28 08:05:01 -04:00 committed by CMake Topic Stage
commit a71a172ebf
1 changed files with 1 additions and 1 deletions

View File

@ -53,7 +53,7 @@ macro(java_append_library_directories _var)
set(_java_libarch "alpha") set(_java_libarch "alpha")
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm") elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
# Subdir is "arm" for both big-endian (arm) and little-endian (armel). # 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") elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^mips")
# mips* machines are bi-endian mostly so processor does not tell # mips* machines are bi-endian mostly so processor does not tell
# endianess of the underlying system. # endianess of the underlying system.