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

src/CMakeLists.txt: Always install .jar files in <prefix>/lib/java/

Browse Source 
In certain cases (debian/ubuntu multi-arch machines) the jar files
were bing installed in <prefix>/lib/lib/java/.

Regardless of platform or architecture, these files need to be in
<prefix>/lib/java/ .

Signed-off-by: Jon Trulson <jtrulson@ics.com>
This commit is contained in:
Jon Trulson 2016-10-20 14:00:15 -06:00
parent dc48698d86
commit dd3e5290b2
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/CMakeLists.txt
View File

@ -231,10 +231,10 @@ macro(upm_swig_java)
) )
install (TARGETS javaupm_${libname} LIBRARY DESTINATION ${LIB_INSTALL_DIR}) install (TARGETS javaupm_${libname} LIBRARY DESTINATION ${LIB_INSTALL_DIR})
# Java jar always goes under lib. This fixes the case where LIB_INSTALL_DIR # Java jar files always need to go under lib/java, regardless of
# is lib64, in which case they still install to lib: lib64/../lib # architecture.
install (FILES ${CMAKE_CURRENT_BINARY_DIR}/upm_${libname}.jar install (FILES ${CMAKE_CURRENT_BINARY_DIR}/upm_${libname}.jar
DESTINATION ${LIB_INSTALL_DIR}/../lib/java) 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)