diff options
| author | Marc Chevrier <marc.chevrier@gmail.com> | 2018-05-05 15:45:57 +0200 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-05-07 09:40:55 -0400 |
| commit | b4e156931511777ffb1b512a6b21e88b02d6bd43 (patch) | |
| tree | ba233b0429ecd531ec7abc5a01221d2f4aaa7290 | |
| parent | 1013560a6a7c34d7f268eacf12ffdb4874a70c8b (diff) | |
| download | cmake-b4e156931511777ffb1b512a6b21e88b02d6bd43.tar.gz | |
FindJava, FindJNI: fix erroneous regex, enhance registry lookup
| -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 ff8d353a38..4913e05e76 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 45bc25482a..306f35d34e 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() |