diff options
| author | Brad King <brad.king@kitware.com> | 2023-05-02 12:39:37 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-05-02 12:39:51 (GMT) |
| commit | 5532fcb8f98b31ce0da2ad44781952f209299bda (patch) | |
| tree | c24c7644fd0951b44bf313bd8fea4d55fadc97af | |
| parent | b548c7efa641214baed232425695ce0605decfa7 (diff) | |
| parent | 7f738313e03780dfc2aadc4ebfdfe06d426867ef (diff) | |
| download | CMake-5532fcb8f98b31ce0da2ad44781952f209299bda.zip CMake-5532fcb8f98b31ce0da2ad44781952f209299bda.tar.gz CMake-5532fcb8f98b31ce0da2ad44781952f209299bda.tar.bz2 | |
Merge topic 'findjni_new_ubuntu_versions' into release-3.26
7f738313e0 FindJNI: add Ubuntu specific paths for more recent JDK versions
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8449
| -rw-r--r-- | Modules/FindJNI.cmake | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake index 64163b0..27f9b0e 100644 --- a/Modules/FindJNI.cmake +++ b/Modules/FindJNI.cmake @@ -290,6 +290,13 @@ set(_JNI_JAVA_DIRECTORIES_BASE # Arch Linux specific paths for default JVM /usr/lib/jvm/default # Ubuntu specific paths for default JVM + /usr/lib/jvm/java-21-openjdk-{libarch} # Ubuntu 23.04 + /usr/lib/jvm/java-20-openjdk-{libarch} # Ubuntu 22.10 + /usr/lib/jvm/java-19-openjdk-{libarch} # Ubuntu 22.04 LTS + /usr/lib/jvm/java-18-openjdk-{libarch} # Ubuntu 22.04 LTS + /usr/lib/jvm/java-17-openjdk-{libarch} # Ubuntu 18.04 LTS + /usr/lib/jvm/java-16-openjdk-{libarch} # Ubuntu 20.04 LTS + /usr/lib/jvm/java-13-openjdk-{libarch} # Ubuntu 20.04 LTS /usr/lib/jvm/java-11-openjdk-{libarch} # Ubuntu 18.04 LTS /usr/lib/jvm/java-8-openjdk-{libarch} # Ubuntu 15.10 /usr/lib/jvm/java-7-openjdk-{libarch} # Ubuntu 15.10 |