summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2010-04-25 20:05:21 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2010-04-25 20:05:21 (GMT)
commit0da537d16792ffcc38ec1fb19d518900b1fe7432 (patch)
tree25579b9407ef05af49533e69ff6bd13f82e2a12d /Modules
parent70f90787806f92ce38172c465eab76cc8a915aba (diff)
downloadCMake-0da537d16792ffcc38ec1fb19d518900b1fe7432.zip
CMake-0da537d16792ffcc38ec1fb19d518900b1fe7432.tar.gz
CMake-0da537d16792ffcc38ec1fb19d518900b1fe7432.tar.bz2
Do not error out if the java version is not found, if java is not required.
Diffstat (limited to 'Modules')
-rw-r--r--Modules/FindJava.cmake6
1 files changed, 5 insertions, 1 deletions
diff --git a/Modules/FindJava.cmake b/Modules/FindJava.cmake
index 7eb6d900c..9e2a640 100644
--- a/Modules/FindJava.cmake
+++ b/Modules/FindJava.cmake
@@ -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