[Cmake-commits] CMake branch, next, updated. v3.3.1-2589-gac74eff
Brad King
brad.king at kitware.com
Fri Aug 28 09:38:10 EDT 2015
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via ac74eff5bb5cb1827cb4636a0bdf9a9baab248ce (commit)
via 90a22c3ac5d38a83d4d487030277db4021c1913a (commit)
via 11d5088a2f02994dc14c72170c73f7d60b0fba03 (commit)
from e1fcdb66be61bcc5d7c5ca9adc05860aec3b17cc (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ac74eff5bb5cb1827cb4636a0bdf9a9baab248ce
commit ac74eff5bb5cb1827cb4636a0bdf9a9baab248ce
Merge: e1fcdb6 90a22c3
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Aug 28 09:38:09 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Aug 28 09:38:09 2015 -0400
Merge topic 'FindJNI-mips' into next
90a22c3a FindJNI: Add mips64(el) mipsn32(el) support (#15714)
11d5088a CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=90a22c3ac5d38a83d4d487030277db4021c1913a
commit 90a22c3ac5d38a83d4d487030277db4021c1913a
Author: Yunqiang Su <wzssyqa at gmail.com>
AuthorDate: Fri Aug 28 09:37:06 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Aug 28 09:37:22 2015 -0400
FindJNI: Add mips64(el) mipsn32(el) support (#15714)
Submitted-by: Felix Geyer <fgeyer at debian.org>
diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake
index 6958a2a..cbe21d7 100644
--- a/Modules/FindJNI.cmake
+++ b/Modules/FindJNI.cmake
@@ -57,7 +57,7 @@ macro(java_append_library_directories _var)
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^mips")
# mips* machines are bi-endian mostly so processor does not tell
# endianess of the underlying system.
- set(_java_libarch "${CMAKE_SYSTEM_PROCESSOR}" "mips" "mipsel" "mipseb")
+ set(_java_libarch "${CMAKE_SYSTEM_PROCESSOR}" "mips" "mipsel" "mipseb" "mips64" "mips64el" "mipsn32" "mipsn32el")
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64le")
set(_java_libarch "ppc64" "ppc64le")
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64")
-----------------------------------------------------------------------
Summary of changes:
Modules/FindJNI.cmake | 2 +-
Source/CMakeVersion.cmake | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list