summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorMarc Chevrier <marc.chevrier@sap.com>2015-08-25 07:31:30 (GMT)
committerBrad King <brad.king@kitware.com>2015-08-25 13:47:05 (GMT)
commit290b0f94b597f5a833f59cc8f70f1627bf8d1aa9 (patch)
tree32914fd0b1c9abd03e216c35bbcaaea2cc3c1102 /Modules
parentc4d78b8bc05d44b8a46b5d2db6b52b42a101ef2d (diff)
downloadCMake-290b0f94b597f5a833f59cc8f70f1627bf8d1aa9.zip
CMake-290b0f94b597f5a833f59cc8f70f1627bf8d1aa9.tar.gz
CMake-290b0f94b597f5a833f59cc8f70f1627bf8d1aa9.tar.bz2
FindJNI: Add support for SuSE platform and IBM Java SDK
Diffstat (limited to 'Modules')
-rw-r--r--Modules/FindJNI.cmake8
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}")