diff options
| author | Brad King <brad.king@kitware.com> | 2015-08-27 14:04:01 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-08-27 14:04:01 (GMT) |
| commit | f96b6af18aebc5791047bc6d7b33375ac570c6e9 (patch) | |
| tree | dcdd40d018618c1e764bacecb76e13b91546bced /Modules | |
| parent | ba6533e658f63d9446993882788f03263d32fe1b (diff) | |
| parent | 290b0f94b597f5a833f59cc8f70f1627bf8d1aa9 (diff) | |
| download | CMake-f96b6af18aebc5791047bc6d7b33375ac570c6e9.zip CMake-f96b6af18aebc5791047bc6d7b33375ac570c6e9.tar.gz CMake-f96b6af18aebc5791047bc6d7b33375ac570c6e9.tar.bz2 | |
Merge topic 'FindJNI-suse-and-ibm'
290b0f94 FindJNI: Add support for SuSE platform and IBM Java SDK
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindJNI.cmake | 8 |
1 files changed, 8 insertions, 0 deletions
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}") |