From 0d2541270ec26a5e8f47a192b773dcdebde9cc83 Mon Sep 17 00:00:00 2001 From: Andrei Vasiliu Date: Thu, 8 Oct 2015 18:07:25 +0300 Subject: [PATCH] java: Modified path of javac and jar Signed-off-by: Andrei Vasiliu Signed-off-by: Mihai Tudor Panu --- src/CMakeLists.txt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5390af32..48e612bf 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -85,8 +85,13 @@ macro(upm_SWIG_JAVA) DESTINATION lib/java ) - set (JAVAC $ENV{JAVA_HOME}/bin/javac) - set (JAR $ENV{JAVA_HOME}/bin/jar) + if (NOT DEFINED $ENV{JAVA_HOME_NATIVE}) + 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 () add_custom_command (TARGET javaupm_${libname} POST_BUILD