summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2024-08-15 14:34:14 (GMT)
committerKitware Robot <kwrobot@kitware.com>2024-08-15 14:34:25 (GMT)
commit97bb92ace5fa26e20a0d0f87131dce9567048985 (patch)
tree7faae488f908f85923d43ceda19540900ea59e5d
parent5f42d87aca67723bb2ab4c7e102b5fca857f76d4 (diff)
parent983291669dade10e5225389b07f6a7329d9c2d3a (diff)
downloadCMake-97bb92ace5fa26e20a0d0f87131dce9567048985.zip
CMake-97bb92ace5fa26e20a0d0f87131dce9567048985.tar.gz
CMake-97bb92ace5fa26e20a0d0f87131dce9567048985.tar.bz2
Merge topic 'FindJNI-zero-vm-location' into release-3.30
983291669d FindJNI: Support finding libjvm.so for all OpenJDK variants Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !9725
-rw-r--r--Modules/FindJNI.cmake2
1 files changed, 2 insertions, 0 deletions
diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake
index abc76cf..51f05b9 100644
--- a/Modules/FindJNI.cmake
+++ b/Modules/FindJNI.cmake
@@ -343,7 +343,9 @@ foreach(dir IN LISTS JAVA_AWT_LIBRARY_DIRECTORIES)
list(APPEND JAVA_JVM_LIBRARY_DIRECTORIES
"${dir}"
"${dir}/client"
+ "${dir}/minimal"
"${dir}/server"
+ "${dir}/zero"
# IBM SDK, Java Technology Edition, specific paths
"${dir}/j9vm"
"${dir}/default"