alexey.zholtikov/upm
1
0
Fork 0
mirror of https://github.com/eclipse/upm.git synced 2025-03-24 01:10:22 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

java: Modified path of javac and jar

Browse Source 
Signed-off-by: Andrei Vasiliu <andrei.vasiliu@intel.com>
Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
This commit is contained in:
Andrei Vasiliu 2015-10-08 18:07:25 +03:00 committed by Mihai Tudor Panu
parent e34863f223
commit 0d2541270e
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/CMakeLists.txt
View File

@ -85,8 +85,13 @@ macro(upm_SWIG_JAVA)
DESTINATION lib/java DESTINATION lib/java
) )
set (JAVAC $ENV{JAVA_HOME}/bin/javac) if (NOT DEFINED $ENV{JAVA_HOME_NATIVE})
set (JAR $ENV{JAVA_HOME}/bin/jar) 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} add_custom_command (TARGET javaupm_${libname}
POST_BUILD POST_BUILD