diff options
| author | Andrei Vasiliu <andrei.vasiliu@intel.com> | 2015-10-08 17:58:48 +0300 |
|---|---|---|
| committer | Brendan Le Foll <brendan.le.foll@intel.com> | 2015-10-09 14:38:30 +0100 |
| commit | 338feb2c3e83584c24dc2b27cce7bb20240e367c (patch) | |
| tree | 89b849c2c4ccb53ddba3f6c5cc0494b77336348b | |
| parent | dbd1a3153635e05c26addc160b99deec438e5be8 (diff) | |
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>
| -rw-r--r-- | src/java/CMakeLists.txt | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/java/CMakeLists.txt b/src/java/CMakeLists.txt index d729897..5225d3b 100644 --- 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}) |