diff options
| author | Brad King <brad.king@kitware.com> | 2018-03-14 15:18:14 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-03-14 15:18:14 (GMT) |
| commit | 7bbaead87d8e9096d8ba90e0eb239d9c76840fff (patch) | |
| tree | 77b2d1863dede9d3d214a11e288dd4ab5c84f52c | |
| parent | a039029e7c4e00f3a64578f94e593f00719bb01c (diff) | |
| parent | 8c92596e9621e687b333f3dcdac5c2bb6d5ca1b1 (diff) | |
| download | CMake-7bbaead87d8e9096d8ba90e0eb239d9c76840fff.zip CMake-7bbaead87d8e9096d8ba90e0eb239d9c76840fff.tar.gz CMake-7bbaead87d8e9096d8ba90e0eb239d9c76840fff.tar.bz2 | |
Merge branch 'findjni-mips-r6-new-arch' into release-3.11
Merge-request: !1853
| -rw-r--r-- | Modules/FindJNI.cmake | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake index c4601a1..e31c19e 100644 --- a/Modules/FindJNI.cmake +++ b/Modules/FindJNI.cmake @@ -47,7 +47,10 @@ macro(java_append_library_directories _var) elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^mips") # mips* machines are bi-endian mostly so processor does not tell # endianness of the underlying system. - set(_java_libarch "${CMAKE_SYSTEM_PROCESSOR}" "mips" "mipsel" "mipseb" "mips64" "mips64el" "mipsn32" "mipsn32el") + set(_java_libarch "${CMAKE_SYSTEM_PROCESSOR}" + "mips" "mipsel" "mipseb" "mipsr6" "mipsr6el" + "mips64" "mips64el" "mips64r6" "mips64r6el" + "mipsn32" "mipsn32el" "mipsn32r6" "mipsn32r6el") elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64le") set(_java_libarch "ppc64" "ppc64le") elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64") |