reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2024-11-23 19:49:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Do not error out if the java version is not found, if java is not required.

Browse Source
This commit is contained in:
Bill Hoffman 2010-04-25 16:05:21 -04:00
parent 70f9078780
commit 0da537d167
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Modules/FindJava.cmake
View File

@ -82,7 +82,11 @@ IF(Java_JAVA_EXECUTABLE)
OUTPUT_STRIP_TRAILING_WHITESPACE
ERROR_STRIP_TRAILING_WHITESPACE)
IF( res )
MESSAGE( FATAL_ERROR "Error executing java -version" )
IF(${Java_FIND_REQUIRED})
MESSAGE( FATAL_ERROR "Error executing java -version" )
ELSE()
MESSAGE( STATUS "Warning, could not run java --version")
ENDIF()
ELSE()
# extract major/minor version and patch level from "java -version" output
# Tested on linux using