Home Explore Help
Register Sign In
Apq
/
CMake
mirror of https://github.com/Kitware/CMake.git
1
0
Fork 0
Files Issues 0 Wiki
Browse Source

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 <[email protected]>
Merge-request: !8449
Brad King 2 years ago
parent
b548c7efa6 7f738313e0
commit
5532fcb8f9
1 changed files with 7 additions and 0 deletions
Split View Show Diff Stats
  1. 7 0
      Modules/FindJNI.cmake

+ 7 - 0
Modules/FindJNI.cmake
View File 

@@ -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