[Cmake-commits] CMake branch, next, updated. v3.1.0-rc2-743-g4348fa3

[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  4348fa359a3981c2c5962f14a650ec2eb89421d5 (commit)
       via  dd378258f1ea07c841f50a6df6a011265441b7e6 (commit)
      from  3257a375975e9ddf5719a3f95312a00c6833fce6 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4348fa359a3981c2c5962f14a650ec2eb89421d5
commit 4348fa359a3981c2c5962f14a650ec2eb89421d5
Merge: 3257a37 dd37825
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Nov 19 16:15:36 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Nov 19 16:15:36 2014 -0500

    Merge topic 'FindJava-no-osx-stub' into next
    
    dd378258 FindJava: Do not accept OS X stub 'java' as Java


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dd378258f1ea07c841f50a6df6a011265441b7e6
commit dd378258f1ea07c841f50a6df6a011265441b7e6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 24 14:42:46 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Nov 19 16:14:56 2014 -0500

    FindJava: Do not accept OS X stub 'java' as Java
    
    OS X provides a stub 'java' to inform callers that Java is not present.
    When checking the 'java -version' output, look for such a message and if
    found pretend 'java' was not found.
    
    Suggested-by: Sean McBride <sean at rogue-research.com>

diff --git a/Modules/FindJava.cmake b/Modules/FindJava.cmake
index 0bd7eb0..be2a90f 100644
--- a/Modules/FindJava.cmake
+++ b/Modules/FindJava.cmake
@@ -115,7 +115,10 @@ if(Java_JAVA_EXECUTABLE)
       OUTPUT_STRIP_TRAILING_WHITESPACE
       ERROR_STRIP_TRAILING_WHITESPACE)
     if( res )
-      if(${Java_FIND_REQUIRED})
+      if(var MATCHES "No Java runtime present, requesting install")
+        set_property(CACHE Java_JAVA_EXECUTABLE
+          PROPERTY VALUE "Java_JAVA_EXECUTABLE-NOTFOUND")
+      elseif(${Java_FIND_REQUIRED})
         message( FATAL_ERROR "Error executing java -version" )
       else()
         message( STATUS "Warning, could not run java -version")

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

Summary of changes:
 Modules/FindJava.cmake |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake