From a73882240b4c6c421921b1c9bcf17ea61286181a Mon Sep 17 00:00:00 2001 From: Henry Bruce Date: Thu, 4 Feb 2016 12:32:04 -0800 Subject: [PATCH] cmake: Stop processing if JAVA_HOME environment variable is not set Signed-off-by: Henry Bruce --- src/java/CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/java/CMakeLists.txt b/src/java/CMakeLists.txt index fb88781..33ec6af 100644 --- a/src/java/CMakeLists.txt +++ b/src/java/CMakeLists.txt @@ -13,7 +13,10 @@ set_source_files_properties (mraajava.i PROPERTIES CPLUSPLUS ON) set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive -DJAVACALLBACK") set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DJAVACALLBACK") -if (NOT DEFINED $ENV{JAVA_HOME_NATIVE}) +if (NOT DEFINED ENV{JAVA_HOME_NATIVE}) + if (NOT DEFINED ENV{JAVA_HOME}) + message (FATAL_ERROR " - Neither JAVA_HOME nor JAVA_HOME_NATIVE are set") + endif() set (JAVA_HOME_NATIVE $ENV{JAVA_HOME}) set (JAVAC $ENV{JAVA_HOME}/bin/javac) set (JAR $ENV{JAVA_HOME}/bin/jar)