src/java/CMakeLists.txt: Modified path for javac and jar

Signed-off-by: Andrei Vasiliu <andrei.vasiliu@intel.com>
Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>

diff --git a/src/java/CMakeLists.txt b/src/java/CMakeLists.txt
index d729897..5225d3b 100644 (file)
--- a/src/java/CMakeLists.txt
+++ b/src/java/CMakeLists.txt
@@ -12,8 +12,14 @@ set_source_files_properties (mraajava.i PROPERTIES CPLUSPLUS ON)
 
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
 
-set (JAVAC $ENV{JAVA_HOME}/bin/javac)
-set (JAR $ENV{JAVA_HOME}/bin/jar)
+if (NOT DEFINED $ENV{JAVA_HOME_NATIVE})
+  set (JAVA_HOME_NATIVE $ENV{JAVA_HOME})
+  set (JAVAC $ENV{JAVA_HOME}/bin/javac)
+  set (JAR $ENV{JAVA_HOME}/bin/jar)
+else ()
+  set (JAVAC $ENV{JAVA_HOME_NATIVE}/bin/javac)
+  set (JAR $ENV{JAVA_HOME_NATIVE}/bin/jar)
+endif ()
 
 swig_add_module (mraajava java mraajava.i ${mraa_LIB_SRCS})
 swig_link_libraries (mraajava ${JAVA_LIBRARIES} ${mraa_LIBS})