mirror of
https://github.com/eclipse/upm.git
synced 2025-03-15 04:57:30 +03:00
java: Updated install path for Java library file
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:
parent
5324808e82
commit
3fab5625c7
@ -100,12 +100,8 @@ macro(upm_SWIG_JAVA)
|
|||||||
PREFIX "lib"
|
PREFIX "lib"
|
||||||
SUFFIX ".so"
|
SUFFIX ".so"
|
||||||
)
|
)
|
||||||
install (FILES ${CMAKE_CURRENT_BINARY_DIR}/libjavaupm_${libname}.so
|
install (TARGETS javaupm_${libname} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
||||||
DESTINATION lib/java
|
install (FILES ${CMAKE_CURRENT_BINARY_DIR}/upm_${libname}.jar DESTINATION ${CMAKE_INSTALL_LIBDIR}/../lib/java)
|
||||||
)
|
|
||||||
install (FILES ${CMAKE_CURRENT_BINARY_DIR}/upm_${libname}.jar
|
|
||||||
DESTINATION lib/java
|
|
||||||
)
|
|
||||||
|
|
||||||
if (NOT DEFINED $ENV{JAVA_HOME_NATIVE})
|
if (NOT DEFINED $ENV{JAVA_HOME_NATIVE})
|
||||||
set (JAVAC $ENV{JAVA_HOME}/bin/javac)
|
set (JAVAC $ENV{JAVA_HOME}/bin/javac)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user