diff options
| author | Brad King <brad.king@kitware.com> | 2015-08-25 19:13:25 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-08-25 19:13:25 (GMT) |
| commit | d030a46913479442ca12c6d193be546b9f471ca0 (patch) | |
| tree | 6982de6af101431f2c6db53c66d00218a891f548 | |
| parent | 9aeee9c60887cf2a5528116c5e1d215f35b2f09f (diff) | |
| parent | c4d78b8bc05d44b8a46b5d2db6b52b42a101ef2d (diff) | |
| download | CMake-d030a46913479442ca12c6d193be546b9f471ca0.zip CMake-d030a46913479442ca12c6d193be546b9f471ca0.tar.gz CMake-d030a46913479442ca12c6d193be546b9f471ca0.tar.bz2 | |
Merge topic 'FindJNI-linux-x32'
c4d78b8b FindJNI: Add support for x32 architecture on Linux (#15710)
| -rw-r--r-- | Modules/FindJNI.cmake | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake index d248fe1..d31fea3 100644 --- a/Modules/FindJNI.cmake +++ b/Modules/FindJNI.cmake @@ -42,7 +42,11 @@ 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") + if(CMAKE_LIBRARY_ARCHITECTURE STREQUAL "x86_64-linux-gnux32") + set(_java_libarch "x32" "amd64" "i386") + else() set(_java_libarch "amd64" "i386") + endif() elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^i.86$") set(_java_libarch "i386") elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^alpha") |