diff options
| author | Brad King <brad.king@kitware.com> | 2016-07-05 14:34:02 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-07-05 14:34:02 -0400 |
| commit | c7e0c3005b37fcbfcc68ed8dd1d07bb5aea65d90 (patch) | |
| tree | e185e33201aa26b1ea47d6fa58727d33f074ff04 | |
| parent | 48680ade091af958ec3c9f5e95e2cc0bfa12fb6e (diff) | |
| parent | 26d16380b077f5a26537fa90f62f90122744bc30 (diff) | |
| download | cmake-c7e0c3005b37fcbfcc68ed8dd1d07bb5aea65d90.tar.gz | |
Merge branch 'FindJNI-ubuntu-paths' into release
| -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 8fe8f7a639..3ceab39bd3 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} |