diff options
| author | Brad King <brad.king@kitware.com> | 2016-07-06 13:36:00 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-07-06 13:36:00 (GMT) |
| commit | 0bcb9efdff2feb0fcbcd8f6982bab956c105c52d (patch) | |
| tree | 7e7577553cdf40dd27d87b0febbbd6af5cff80a5 | |
| parent | 73f480b0ad6a9fed1dcadab7ff2b1afb6547941a (diff) | |
| parent | 26d16380b077f5a26537fa90f62f90122744bc30 (diff) | |
| download | CMake-0bcb9efdff2feb0fcbcd8f6982bab956c105c52d.zip CMake-0bcb9efdff2feb0fcbcd8f6982bab956c105c52d.tar.gz CMake-0bcb9efdff2feb0fcbcd8f6982bab956c105c52d.tar.bz2 | |
Merge topic 'FindJNI-ubuntu-paths'
26d16380 FindJNI: Fix support for Ubuntu 15.10
| -rw-r--r-- | Modules/FindJNI.cmake | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake index 8fe8f7a..3ceab39 100644 --- a/Modules/FindJNI.cmake +++ b/Modules/FindJNI.cmake @@ -151,13 +151,14 @@ JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES /usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/{libarch} # can this one be removed according to #8821 ? Alex /usr/lib/jvm/java-6-openjdk/jre/lib/{libarch} /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/{libarch} # fedora - /usr/lib/jvm/java-8-openjdk-{libarch}/lib/{libarch} # ubuntu 15.10 - /usr/lib/jvm/java-7-openjdk-{libarch}/lib/{libarch} # ubuntu 15.10 - /usr/lib/jvm/java-6-openjdk-{libarch}/lib/{libarch} # ubuntu 15.10 # Debian specific paths for default JVM /usr/lib/jvm/default-java/jre/lib/{libarch} /usr/lib/jvm/default-java/jre/lib /usr/lib/jvm/default-java/lib + # 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 + /usr/lib/jvm/java-6-openjdk-{libarch}/jre/lib/{libarch} # Ubuntu 15.10 # OpenBSD specific paths for default JVM /usr/local/jdk-1.7.0/jre/lib/{libarch} /usr/local/jre-1.7.0/lib/{libarch} |