[Cmake-commits] CMake branch, next, updated. v3.4.1-1594-g5cd4443

[Brad King]

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  5cd4443436fc33e6eea2dd81ce4575b4a41c7973 (commit)
       via  4d4fcabdfd9ceb02d947f6631370f6091e1ed337 (commit)
      from  11827dbbe0052170df574bc23c9fee5ce7287e38 (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=5cd4443436fc33e6eea2dd81ce4575b4a41c7973
commit 5cd4443436fc33e6eea2dd81ce4575b4a41c7973
Merge: 11827db 4d4fcab
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Dec 4 09:31:48 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Dec 4 09:31:48 2015 -0500

    Merge topic 'FindJNI-aix' into next
    
    4d4fcabd FindJNI: Add support for AIX java sdk


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4d4fcabdfd9ceb02d947f6631370f6091e1ed337
commit 4d4fcabdfd9ceb02d947f6631370f6091e1ed337
Author:     Marc Chevrier <marc.chevrier at sap.com>
AuthorDate: Thu Dec 3 12:37:26 2015 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Dec 4 09:31:35 2015 -0500

    FindJNI: Add support for AIX java sdk

diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake
index cbe21d7..135038c 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,8 @@ 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
+  PATHS
   ${JAVA_INCLUDE_PATH}
   ${JAVA_INCLUDE_PATH}/darwin
   ${JAVA_INCLUDE_PATH}/win32
@@ -281,6 +282,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:


hooks/post-receive
-- 
CMake