[Cmake-commits] CMake branch, next, updated. v3.4.1-1592-g11827db
Brad King
brad.king at kitware.com
Fri Dec 4 09:28:31 EST 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 11827dbbe0052170df574bc23c9fee5ce7287e38 (commit)
via 1897aba57b4471d06b54fbb178caf233a4bd6308 (commit)
from 28b34545ee7e2e8de7ef8f4dbac33ae28b9d6401 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=11827dbbe0052170df574bc23c9fee5ce7287e38
commit 11827dbbe0052170df574bc23c9fee5ce7287e38
Merge: 28b3454 1897aba
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Dec 4 09:28:24 2015 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Dec 4 09:28:24 2015 -0500
Merge topic 'FindJNI-aix' into next
1897aba5 fixup! FindJNI: Add support for AIX java sdk
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1897aba57b4471d06b54fbb178caf233a4bd6308
commit 1897aba57b4471d06b54fbb178caf233a4bd6308
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Dec 4 09:27:46 2015 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Dec 4 09:27:46 2015 -0500
fixup! FindJNI: Add support for AIX java sdk
diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake
index 037764a..135038c 100644
--- a/Modules/FindJNI.cmake
+++ b/Modules/FindJNI.cmake
@@ -272,6 +272,7 @@ find_path(JAVA_INCLUDE_PATH jni.h
)
find_path(JAVA_INCLUDE_PATH2 NAMES jni_md.h jniport.h
+ PATHS
${JAVA_INCLUDE_PATH}
${JAVA_INCLUDE_PATH}/darwin
${JAVA_INCLUDE_PATH}/win32
-----------------------------------------------------------------------
Summary of changes:
Modules/FindJNI.cmake | 1 +
1 file changed, 1 insertion(+)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list