diff options
| author | Marc Chevrier <marc.chevrier@sap.com> | 2018-04-27 13:38:32 +0200 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-04-27 08:52:22 -0400 |
| commit | 1013560a6a7c34d7f268eacf12ffdb4874a70c8b (patch) | |
| tree | 9b98585a83fd7ea80e6a67c90037338f1137d46f | |
| parent | 5482f485b8c3114d258c4cd1a379a6cd12921cb1 (diff) | |
| download | cmake-1013560a6a7c34d7f268eacf12ffdb4874a70c8b.tar.gz | |
FindJava, FindJNI: Ensure most recent version is searched first
| -rw-r--r-- | Modules/FindJNI.cmake | 18 | ||||
| -rw-r--r-- | Modules/FindJava.cmake | 20 |
2 files changed, 31 insertions, 7 deletions
diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake index 4a56a1c835..ff8d353a38 100644 --- a/Modules/FindJNI.cmake +++ b/Modules/FindJNI.cmake @@ -129,9 +129,21 @@ if (WIN32) ERROR_QUIET) if (NOT _JNI_RESULT) string (REGEX MATCHALL "HKEY_LOCAL_MACHINE\\\\SOFTWARE\\\\JavaSoft\\\\JDK\\\\[0-9\.]+" _JNI_VERSIONS "${_JNI_VERSIONS}") - foreach (_JNI_HINT IN LISTS _JNI_VERSIONS) - list(APPEND _JNI_HINTS "[${_JNI_HINT}\\MSI;INSTALLDIR]") - endforeach() + if (_JNI_VERSIONS) + # sort versions. Most recent first + ## handle version 9 apart from other versions to get correct ordering + set (_JNI_V9 ${_JNI_VERSIONS}) + list (FILTER _JNI_VERSIONS EXCLUDE REGEX "JDK\\\\9") + list (SORT _JNI_VERSIONS) + list (REVERSE _JNI_VERSIONS) + list (FILTER _JNI_V9 INCLUDE REGEX "JDK\\\\9") + list (SORT _JNI_V9) + list (REVERSE _JNI_V9) + list (APPEND _JNI_VERSIONS ${_JNI_V9}) + foreach (_JNI_HINT IN LISTS _JNI_VERSIONS) + list(APPEND _JNI_HINTS "[${_JNI_HINT}\\MSI;INSTALLDIR]") + endforeach() + endif() endif() foreach (_JNI_HINT IN LISTS _JNI_HINTS) diff --git a/Modules/FindJava.cmake b/Modules/FindJava.cmake index 41c05eb096..45bc25482a 100644 --- a/Modules/FindJava.cmake +++ b/Modules/FindJava.cmake @@ -84,10 +84,22 @@ if (WIN32) OUTPUT_VARIABLE _JAVA_VERSIONS ERROR_QUIET) if (NOT _JAVA_RESULT) - string (REGEX MATCHALL "HKEY_LOCAL_MACHINE\\\\SOFTWARE\\\\JavaSoft\\\\${_KIND}\\\\[0-9\.]+" _JAVA_VERSIONS "${_JAVA_VERSIONS}") - foreach (_JAVA_HINT IN LISTS _JAVA_VERSIONS) - list(APPEND _JAVA_HINTS "[${_JAVA_HINT}\\MSI;INSTALLDIR]/bin") - endforeach() + string (REGEX MATCHALL "HKEY_LOCAL_MACHINE\\\\SOFTWARE\\\\JavaSoft\\\\${_KIND}\\\\[0-9.]+" _JAVA_VERSIONS "${_JAVA_VERSIONS}") + if (_JAVA_VERSIONS) + # sort versions. Most recent first + ## handle version 9 apart from other versions to get correct ordering + set (_JAVA_V9 ${_JAVA_VERSIONS}) + list (FILTER _JAVA_VERSIONS EXCLUDE REGEX "${_KIND}\\\\9") + list (SORT _JAVA_VERSIONS) + list (REVERSE _JAVA_VERSIONS) + list (FILTER _JAVA_V9 INCLUDE REGEX "${_KIND}\\\\9") + list (SORT _JAVA_V9) + list (REVERSE _JAVA_V9) + list (APPEND _JAVA_VERSIONS ${_JAVA_V9}) + foreach (_JAVA_HINT IN LISTS _JAVA_VERSIONS) + list(APPEND _JAVA_HINTS "[${_JAVA_HINT}\\MSI;INSTALLDIR]/bin") + endforeach() + endif() endif() endmacro() |