[Cmake-commits] CMake branch, next, updated. v3.7.1-2081-gef155cf

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  ef155cf6403be058f878d046045e111a1bff41d8 (commit)
       via  eb728d266e171987616c71a63f3f772eab45ebf3 (commit)
      from  5c6d51bdf072a8fb6e683636321e57430c0268ac (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ef155cf6403be058f878d046045e111a1bff41d8
commit ef155cf6403be058f878d046045e111a1bff41d8
Merge: 5c6d51b eb728d2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 11 11:45:17 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 11 11:45:17 2017 -0500

    Merge topic 'FindJava-jre-hints' into next
    
    eb728d26 FindJava: add hints for jre


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eb728d266e171987616c71a63f3f772eab45ebf3
commit eb728d266e171987616c71a63f3f772eab45ebf3
Author:     Rechi Rechi <Rechi at users.noreply.github.com>
AuthorDate: Wed Jan 11 16:31:01 2017 +0100
Commit:     Rechi Rechi <Rechi at users.noreply.github.com>
CommitDate: Wed Jan 11 16:31:01 2017 +0100

    FindJava: add hints for jre

diff --git a/Modules/FindJava.cmake b/Modules/FindJava.cmake
index 5c0abb0..4265a97 100644
--- a/Modules/FindJava.cmake
+++ b/Modules/FindJava.cmake
@@ -86,6 +86,14 @@ list(APPEND _JAVA_HINTS
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.5;JavaHome]/bin"
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/bin"
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/bin"
+  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Runtime Environment\\2.0;JavaHome]/bin"
+  "[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.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"
   )
 # Hard-coded guesses should still go in PATHS. This ensures that the user
 # environment can always override hard guesses.

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindJava.cmake |    8 ++++++++
 1 file changed, 8 insertions(+)


hooks/post-receive
-- 
CMake