diff options
| author | Brad King <brad.king@kitware.com> | 2013-11-05 13:16:51 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-11-05 13:16:51 (GMT) |
| commit | d94416725e6a54acaee8c692ef512ed50ee8cf29 (patch) | |
| tree | c9523343a161535beb54b20674fedef9d98cd326 /Modules | |
| parent | f506a2efbea1f7141e6adff199f1371def139d7a (diff) | |
| parent | cde56c1223dd50d57757f03575e5e642925059f3 (diff) | |
| download | CMake-d94416725e6a54acaee8c692ef512ed50ee8cf29.zip CMake-d94416725e6a54acaee8c692ef512ed50ee8cf29.tar.gz CMake-d94416725e6a54acaee8c692ef512ed50ee8cf29.tar.bz2 | |
Merge topic 'FindJNI-biarch'
cde56c1 FindJNI: Support biarch installations (#14541)
Diffstat (limited to 'Modules')
| -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") |