kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'FindJNI-suse-and-ibm' 

290b0f94 FindJNI: Add support for SuSE platform and IBM Java SDK
This commit is contained in:
Brad King 2015-08-27 10:04:01 -04:00 committed by CMake Topic Stage
parent ba6533e658 290b0f94b5
commit f96b6af18a
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Modules/FindJNI.cmake
View File

@ -156,6 +156,9 @@ JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
/usr/local/jre-1.7.0/lib/{libarch} /usr/local/jre-1.7.0/lib/{libarch}
/usr/local/jdk-1.6.0/jre/lib/{libarch} /usr/local/jdk-1.6.0/jre/lib/{libarch}
/usr/local/jre-1.6.0/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) set(JAVA_JVM_LIBRARY_DIRECTORIES)
@ -164,6 +167,9 @@ foreach(dir ${JAVA_AWT_LIBRARY_DIRECTORIES})
"${dir}" "${dir}"
"${dir}/client" "${dir}/client"
"${dir}/server" "${dir}/server"
# IBM SDK, Java Technology Edition, specific paths
"${dir}/j9vm"
"${dir}/default"
) )
endforeach() endforeach()
@ -193,6 +199,8 @@ list(APPEND JAVA_AWT_INCLUDE_DIRECTORIES
# OpenBSD specific path for default JVM # OpenBSD specific path for default JVM
/usr/local/jdk-1.7.0/include /usr/local/jdk-1.7.0/include
/usr/local/jdk-1.6.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}") foreach(JAVA_PROG "${JAVA_RUNTIME}" "${JAVA_COMPILE}" "${JAVA_ARCHIVE}")