[Cmake-commits] CMake branch, next, updated. v2.8.4-1393-ged44b79
Mathieu Malaterre
mathieu.malaterre at gmail.com
Fri Apr 8 09:21:01 EDT 2011
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 ed44b79d288b2569e42e8ff4ef194c21dc8f9451 (commit)
via 4f35488fe97c6e427e5835e7c50043d1d0b41331 (commit)
from 8ce73ecf1c1b89d29c46a0054674356a26f5cea5 (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=ed44b79d288b2569e42e8ff4ef194c21dc8f9451
commit ed44b79d288b2569e42e8ff4ef194c21dc8f9451
Merge: 8ce73ec 4f35488
Author: Mathieu Malaterre <mathieu.malaterre at gmail.com>
AuthorDate: Fri Apr 8 09:20:53 2011 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Apr 8 09:20:53 2011 -0400
Merge topic 'fixbug_0010242' into next
4f35488 Add support for FindJava on HP-UX and alpha
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4f35488fe97c6e427e5835e7c50043d1d0b41331
commit 4f35488fe97c6e427e5835e7c50043d1d0b41331
Author: Mathieu Malaterre <mathieu.malaterre at gmail.com>
AuthorDate: Mon Mar 28 17:57:04 2011 +0200
Commit: Mathieu Malaterre <mathieu.malaterre at gmail.com>
CommitDate: Fri Apr 8 15:19:28 2011 +0200
Add support for FindJava on HP-UX and alpha
This commit fixes BUG: 0010242. It now properly inspect specific directory
on hp-ux and alpha implementation of the JRE
diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake
index 6ba1826..da24fc0 100644
--- a/Modules/FindJNI.cmake
+++ b/Modules/FindJNI.cmake
@@ -226,6 +226,8 @@ FIND_PATH(JAVA_INCLUDE_PATH2 jni_md.h
${JAVA_INCLUDE_PATH}/linux
${JAVA_INCLUDE_PATH}/freebsd
${JAVA_INCLUDE_PATH}/solaris
+ ${JAVA_INCLUDE_PATH}/hp-ux
+ ${JAVA_INCLUDE_PATH}/alpha
)
FIND_PATH(JAVA_AWT_INCLUDE_PATH jawt.h
-----------------------------------------------------------------------
Summary of changes:
Modules/FindJNI.cmake | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list