diff options
| author | Brad King <brad.king@kitware.com> | 2018-05-08 12:20:25 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-05-08 12:20:36 (GMT) |
| commit | 14bfd267e5e7498f0131b87e54c11cafa2ff6903 (patch) | |
| tree | ecba961f7cd53a90bbb1a9fc61ec0c1381be0fde | |
| parent | c0fa21322c0996df8479fd58f33345c051226fd2 (diff) | |
| parent | b4e156931511777ffb1b512a6b21e88b02d6bd43 (diff) | |
| download | CMake-14bfd267e5e7498f0131b87e54c11cafa2ff6903.zip CMake-14bfd267e5e7498f0131b87e54c11cafa2ff6903.tar.gz CMake-14bfd267e5e7498f0131b87e54c11cafa2ff6903.tar.bz2 | |
Merge topic 'java-new-packaging-fixes'
b4e1569315 FindJava, FindJNI: fix erroneous regex, enhance registry lookup
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2042
| -rw-r--r-- | Modules/FindJNI.cmake | 4 | ||||
| -rw-r--r-- | Modules/FindJava.cmake | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake index ff8d353..4913e05 100644 --- a/Modules/FindJNI.cmake +++ b/Modules/FindJNI.cmake @@ -128,7 +128,7 @@ if (WIN32) OUTPUT_VARIABLE _JNI_VERSIONS ERROR_QUIET) if (NOT _JNI_RESULT) - string (REGEX MATCHALL "HKEY_LOCAL_MACHINE\\\\SOFTWARE\\\\JavaSoft\\\\JDK\\\\[0-9\.]+" _JNI_VERSIONS "${_JNI_VERSIONS}") + string (REGEX MATCHALL "HKEY_LOCAL_MACHINE\\\\SOFTWARE\\\\JavaSoft\\\\JDK\\\\[0-9.]+" _JNI_VERSIONS "${_JNI_VERSIONS}") if (_JNI_VERSIONS) # sort versions. Most recent first ## handle version 9 apart from other versions to get correct ordering @@ -141,7 +141,7 @@ if (WIN32) 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]") + list(APPEND _JNI_HINTS "[${_JNI_HINT};JavaHome]") endforeach() endif() endif() diff --git a/Modules/FindJava.cmake b/Modules/FindJava.cmake index 95e551f..cddc5d2 100644 --- a/Modules/FindJava.cmake +++ b/Modules/FindJava.cmake @@ -97,7 +97,7 @@ if (WIN32) 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") + list(APPEND _JAVA_HINTS "[${_JAVA_HINT};JavaHome]/bin") endforeach() endif() endif() |