diff options
| author | Brad King <brad.king@kitware.com> | 2017-08-02 15:31:27 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-08-02 15:31:27 (GMT) |
| commit | 39bd20a490fb0db69076ef246729fced6d22de01 (patch) | |
| tree | 76afc5e24879bdc5bc42bb5d735e0e74644291fb | |
| parent | dc859d3da115fe514d6b6d63d786444ff42b167a (diff) | |
| parent | 5479074be1d64213cb3d7ccd124b9fa1d6e0cad4 (diff) | |
| download | CMake-39bd20a490fb0db69076ef246729fced6d22de01.zip CMake-39bd20a490fb0db69076ef246729fced6d22de01.tar.gz CMake-39bd20a490fb0db69076ef246729fced6d22de01.tar.bz2 | |
Merge branch 'FindJava-fix-1.6-registry' into release-3.9
Merge-request: !1079
| -rw-r--r-- | Modules/FindJava.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/FindJava.cmake b/Modules/FindJava.cmake index d762452..eb2242b 100644 --- a/Modules/FindJava.cmake +++ b/Modules/FindJava.cmake @@ -90,7 +90,7 @@ list(APPEND _JAVA_HINTS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Runtime Environment\\1.9;JavaHome]/bin" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Runtime Environment\\1.8;JavaHome]/bin" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Runtime Environment\\1.7;JavaHome]/bin" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Runtime Environment\\2.6;JavaHome]/bin" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Runtime Environment\\1.6;JavaHome]/bin" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Runtime Environment\\1.5;JavaHome]/bin" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Runtime Environment\\1.4;JavaHome]/bin" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Runtime Environment\\1.3;JavaHome]/bin" |