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 d8ac93fff8a91c77294d2c5b062765ebdafdbe1e (commit) via 6fc91ffb5f836e5878295030ea83a8f733fd0e96 (commit) from 103203b3b0b83c73476f82a2e1bd29bb272a53c6 (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=d8ac93fff8a91c77294d2c5b062765ebdafdbe1e commit d8ac93fff8a91c77294d2c5b062765ebdafdbe1e Merge: 103203b 6fc91ff Author: Brad King <brad.k...@kitware.com> AuthorDate: Thu Dec 3 09:23:08 2015 -0500 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Thu Dec 3 09:23:08 2015 -0500 Merge topic 'FindJNI-aix' into next 6fc91ffb FindJNI: Add support for AIX java sdk https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6fc91ffb5f836e5878295030ea83a8f733fd0e96 commit 6fc91ffb5f836e5878295030ea83a8f733fd0e96 Author: Marc Chevrier <marc.chevr...@sap.com> AuthorDate: Thu Dec 3 12:37:26 2015 +0100 Commit: Brad King <brad.k...@kitware.com> CommitDate: Thu Dec 3 09:20:07 2015 -0500 FindJNI: Add support for AIX java sdk diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake index cbe21d7..037764a 100644 --- a/Modules/FindJNI.cmake +++ b/Modules/FindJNI.cmake @@ -63,7 +63,7 @@ macro(java_append_library_directories _var) elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64") set(_java_libarch "ppc64" "ppc") elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)") - set(_java_libarch "ppc") + set(_java_libarch "ppc" "ppc64") elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^sparc") # Both flavours can run on the same processor set(_java_libarch "${CMAKE_SYSTEM_PROCESSOR}" "sparc" "sparcv9") @@ -271,7 +271,7 @@ find_path(JAVA_INCLUDE_PATH jni.h ${JAVA_AWT_INCLUDE_DIRECTORIES} ) -find_path(JAVA_INCLUDE_PATH2 jni_md.h +find_path(JAVA_INCLUDE_PATH2 NAMES jni_md.h jniport.h ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH}/darwin ${JAVA_INCLUDE_PATH}/win32 @@ -281,6 +281,7 @@ find_path(JAVA_INCLUDE_PATH2 jni_md.h ${JAVA_INCLUDE_PATH}/solaris ${JAVA_INCLUDE_PATH}/hp-ux ${JAVA_INCLUDE_PATH}/alpha + ${JAVA_INCLUDE_PATH}/aix ) find_path(JAVA_AWT_INCLUDE_PATH jawt.h ----------------------------------------------------------------------- Summary of changes: Modules/FindJNI.cmake | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits