From dd3e5290b2d3dd6101c37410e193016a22f80a1b Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Thu, 20 Oct 2016 14:00:15 -0600 Subject: [PATCH] src/CMakeLists.txt: Always install .jar files in /lib/java/ In certain cases (debian/ubuntu multi-arch machines) the jar files were bing installed in /lib/lib/java/. Regardless of platform or architecture, these files need to be in /lib/java/ . Signed-off-by: Jon Trulson --- src/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 100be51c..70613542 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -231,10 +231,10 @@ macro(upm_swig_java) ) install (TARGETS javaupm_${libname} LIBRARY DESTINATION ${LIB_INSTALL_DIR}) - # Java jar always goes under lib. This fixes the case where LIB_INSTALL_DIR - # is lib64, in which case they still install to lib: lib64/../lib + # Java jar files always need to go under lib/java, regardless of + # architecture. 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}) set (JAVAC $ENV{JAVA_HOME}/bin/javac)