[Cmake-commits] CMake branch, next, updated. v3.3.1-2435-gf23c21d

[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  f23c21d028ecebc11ac724ea663d783eb477f4f8 (commit)
       via  290b0f94b597f5a833f59cc8f70f1627bf8d1aa9 (commit)
      from  7b03a6bd559fdfabf7bab274cb3f99f9bc212edc (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=f23c21d028ecebc11ac724ea663d783eb477f4f8
commit f23c21d028ecebc11ac724ea663d783eb477f4f8
Merge: 7b03a6b 290b0f9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Aug 25 09:47:27 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Aug 25 09:47:27 2015 -0400

    Merge topic 'FindJNI-suse-and-ibm' into next
    
    290b0f94 FindJNI: Add support for SuSE platform and IBM Java SDK


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=290b0f94b597f5a833f59cc8f70f1627bf8d1aa9
commit 290b0f94b597f5a833f59cc8f70f1627bf8d1aa9
Author:     Marc Chevrier <marc.chevrier at sap.com>
AuthorDate: Tue Aug 25 09:31:30 2015 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Aug 25 09:47:05 2015 -0400

    FindJNI: Add support for SuSE platform and IBM Java SDK

diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake
index d31fea3..6958a2a 100644
--- a/Modules/FindJNI.cmake
+++ b/Modules/FindJNI.cmake
@@ -156,6 +156,9 @@ JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
   /usr/local/jre-1.7.0/lib/{libarch}
   /usr/local/jdk-1.6.0/jre/lib/{libarch}
   /usr/local/jre-1.6.0/lib/{libarch}
+  # SuSE specific paths for default JVM
+  /usr/lib64/jvm/java/jre/lib/{libarch}
+  /usr/lib64/jvm/jre/lib/{libarch}
   )
 
 set(JAVA_JVM_LIBRARY_DIRECTORIES)
@@ -164,6 +167,9 @@ foreach(dir ${JAVA_AWT_LIBRARY_DIRECTORIES})
     "${dir}"
     "${dir}/client"
     "${dir}/server"
+    # IBM SDK, Java Technology Edition, specific paths
+    "${dir}/j9vm"
+    "${dir}/default"
     )
 endforeach()
 
@@ -193,6 +199,8 @@ list(APPEND JAVA_AWT_INCLUDE_DIRECTORIES
   # OpenBSD specific path for default JVM
   /usr/local/jdk-1.7.0/include
   /usr/local/jdk-1.6.0/include
+  # SuSE specific paths for default JVM
+  /usr/lib64/jvm/java/include
   )
 
 foreach(JAVA_PROG "${JAVA_RUNTIME}" "${JAVA_COMPILE}" "${JAVA_ARCHIVE}")

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindJNI.cmake |    8 ++++++++
 1 file changed, 8 insertions(+)


hooks/post-receive
-- 
CMake