diff options
| author | Modestas Vainius <modax@debian.org> | 2013-11-04 13:55:02 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-11-04 13:55:02 (GMT) |
| commit | cde56c1223dd50d57757f03575e5e642925059f3 (patch) | |
| tree | 01b5bebd82bd8ece215d57ebb402534f92da8091 | |
| parent | b4a1f442bbaaaa5c1260e87ae7e8e488c8ccef16 (diff) | |
| download | CMake-cde56c1223dd50d57757f03575e5e642925059f3.zip CMake-cde56c1223dd50d57757f03575e5e642925059f3.tar.gz CMake-cde56c1223dd50d57757f03575e5e642925059f3.tar.bz2 | |
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
| -rw-r--r-- | Modules/FindJNI.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
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") |