From cb4c9152d6686bf146a64a5ea21a53eacff31f45 Mon Sep 17 00:00:00 2001 From: Andrei Vasiliu Date: Tue, 9 Feb 2016 20:23:26 +0200 Subject: [PATCH] java/CMakeLists.txt: Updated install path for Java library file Signed-off-by: Andrei Vasiliu Signed-off-by: Brendan Le Foll --- src/java/CMakeLists.txt | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/java/CMakeLists.txt b/src/java/CMakeLists.txt index 1df9cb1..fb88781 100644 --- a/src/java/CMakeLists.txt +++ b/src/java/CMakeLists.txt @@ -30,7 +30,6 @@ add_custom_command (TARGET mraajava COMMAND cmake -E echo "Compiling java.." COMMAND cmake -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/mraa COMMAND ${JAVAC} *.java -d ${CMAKE_CURRENT_BINARY_DIR} - COMMAND cmake -E create_symlink java/libmraajava.so ${CMAKE_CURRENT_BINARY_DIR}/../libmraajava.so COMMAND cmake -E echo "Creating jar" COMMAND ${JAR} cvf mraa.jar mraa ) @@ -43,10 +42,5 @@ endif () mraa_create_install_pkgconfig (mraajava.pc ${CMAKE_INSTALL_LIBDIR}/pkgconfig) -install (FILES ${CMAKE_CURRENT_BINARY_DIR}/libmraajava.so - ${CMAKE_CURRENT_BINARY_DIR}/mraa.jar - DESTINATION lib/java -) -install (FILES ${CMAKE_CURRENT_BINARY_DIR}/../libmraajava.so - DESTINATION lib/ -) +install (TARGETS mraajava LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) +install (FILES ${CMAKE_CURRENT_BINARY_DIR}/mraa.jar DESTINATION ${CMAKE_INSTALL_LIBDIR}/../lib/java)