From cde56c1223dd50d57757f03575e5e642925059f3 Mon Sep 17 00:00:00 2001 From: Modestas Vainius Date: Mon, 4 Nov 2013 08:55:02 -0500 Subject: 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 --- Modules/FindJNI.cmake | 4 ++-- 1 file 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") -- cgit v0.12