Raspberries/mraa
Private
Public Access
2
0
Fork 0
Code Activity

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

Browse Source 
Signed-off-by: Andrei Vasiliu <andrei.vasiliu@intel.com>
Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
This commit is contained in:
Andrei Vasiliu
2015-10-08 17:58:48 +03:00
committed by Brendan Le Foll
parent dbd1a31536
commit 338feb2c3e
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/java/CMakeLists.txt
View File

@@ -12,8 +12,14 @@ set_source_files_properties (mraajava.i PROPERTIES CPLUSPLUS ON)
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive") set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
if (NOT DEFINED $ENV{JAVA_HOME_NATIVE})
set (JAVA_HOME_NATIVE $ENV{JAVA_HOME})
set (JAVAC $ENV{JAVA_HOME}/bin/javac) set (JAVAC $ENV{JAVA_HOME}/bin/javac)
set (JAR $ENV{JAVA_HOME}/bin/jar) 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_add_module (mraajava java mraajava.i ${mraa_LIB_SRCS})
swig_link_libraries (mraajava ${JAVA_LIBRARIES} ${mraa_LIBS}) swig_link_libraries (mraajava ${JAVA_LIBRARIES} ${mraa_LIBS})