kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'FindJava-no-osx-stub' 

dd378258 FindJava: Do not accept OS X stub 'java' as Java
This commit is contained in:
Brad King 2014-11-20 08:57:07 -05:00 committed by CMake Topic Stage
parent b6f6b0a983 dd378258f1
commit 3749ad49e3
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Modules/FindJava.cmake
View File

@ -115,7 +115,10 @@ if(Java_JAVA_EXECUTABLE)
OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_STRIP_TRAILING_WHITESPACE
ERROR_STRIP_TRAILING_WHITESPACE) ERROR_STRIP_TRAILING_WHITESPACE)
if( res ) 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" ) message( FATAL_ERROR "Error executing java -version" )
else() else()
message( STATUS "Warning, could not run java -version") message( STATUS "Warning, could not run java -version")