diff options
| author | Jordan Henderson <jhenderson@hdfgroup.org> | 2017-03-10 15:05:36 (GMT) |
|---|---|---|
| committer | Jordan Henderson <jhenderson@hdfgroup.org> | 2017-03-10 15:05:36 (GMT) |
| commit | 281c24a5a91b16eaf498e5dd5af783773c228758 (patch) | |
| tree | 4777cd13a47ce3bc7a043090598c0682b9372ee7 /config/cmake/FindJNI.cmake | |
| parent | 104d63f25a8cb6e156bc901eb85aafc0b67775ee (diff) | |
| download | hdf5-281c24a5a91b16eaf498e5dd5af783773c228758.zip hdf5-281c24a5a91b16eaf498e5dd5af783773c228758.tar.gz hdf5-281c24a5a91b16eaf498e5dd5af783773c228758.tar.bz2 | |
Revert "Merge latest changes from develop"
This reverts commit 104d63f25a8cb6e156bc901eb85aafc0b67775ee.
Diffstat (limited to 'config/cmake/FindJNI.cmake')
| -rw-r--r-- | config/cmake/FindJNI.cmake | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/cmake/FindJNI.cmake b/config/cmake/FindJNI.cmake index baab2ea..9d755fc 100644 --- a/config/cmake/FindJNI.cmake +++ b/config/cmake/FindJNI.cmake @@ -147,6 +147,8 @@ JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES /usr/lib/jvm/java-1.5.0-sun/jre/lib/{libarch} /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-7-openjdk/jre/lib/{libarch} + /usr/lib/jvm/java-7-openjdk-{libarch}/jre/lib/{libarch} /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/{libarch} # fedora # Debian specific paths for default JVM /usr/lib/jvm/default-java/jre/lib/{libarch} |