diff options
| author | Brad King <brad.king@kitware.com> | 2017-03-03 13:16:10 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-03-03 13:16:10 (GMT) |
| commit | 9f37f94d639aa4a5cc42a2f60fafb51bed317e1b (patch) | |
| tree | 11107153ae87c76682fb510e0a92fd28220fe60a /Modules | |
| parent | 3e06cdc19bc6670e19dd3697f257f0b89e5cd3f7 (diff) | |
| parent | d0ada3e2183d3f80125795a3b13acafa7cc0c477 (diff) | |
| download | CMake-9f37f94d639aa4a5cc42a2f60fafb51bed317e1b.zip CMake-9f37f94d639aa4a5cc42a2f60fafb51bed317e1b.tar.gz CMake-9f37f94d639aa4a5cc42a2f60fafb51bed317e1b.tar.bz2 | |
Merge branch 'FindJNI-archlinux-jvm-paths' into release
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindJNI.cmake | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake index 39e504f..cebba10 100644 --- a/Modules/FindJNI.cmake +++ b/Modules/FindJNI.cmake @@ -145,6 +145,9 @@ JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES /usr/lib/jvm/default-java/jre/lib/{libarch} /usr/lib/jvm/default-java/jre/lib /usr/lib/jvm/default-java/lib + # Arch Linux specific paths for default JVM + /usr/lib/jvm/default/jre/lib/{libarch} + /usr/lib/jvm/default/lib/{libarch} # Ubuntu specific paths for default JVM /usr/lib/jvm/java-8-openjdk-{libarch}/jre/lib/{libarch} # Ubuntu 15.10 /usr/lib/jvm/java-7-openjdk-{libarch}/jre/lib/{libarch} # Ubuntu 15.10 @@ -200,6 +203,8 @@ JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_INCLUDE_DIRECTORIES /opt/sun-jdk-1.5.0.04/include # Debian specific path for default JVM /usr/lib/jvm/default-java/include + # Arch specific path for default JVM + /usr/lib/jvm/default/include # OpenBSD specific path for default JVM /usr/local/jdk-1.7.0/include /usr/local/jdk-1.6.0/include |