Raspberries/mraa
Private
Public Access
2
0
Fork 0
Code Activity

java/CMakeLists.txt: Updated install path for Java library file

Browse Source 
Signed-off-by: Andrei Vasiliu <andrei.vasiliu@intel.com>
Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
This commit is contained in:
Andrei Vasiliu
2016-02-09 20:23:26 +02:00
committed by Brendan Le Foll
parent 61011df748
commit cb4c9152d6
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/java/CMakeLists.txt
View File

@@ -30,7 +30,6 @@ add_custom_command (TARGET mraajava
COMMAND cmake -E echo "Compiling java.." COMMAND cmake -E echo "Compiling java.."
COMMAND cmake -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/mraa COMMAND cmake -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/mraa
COMMAND ${JAVAC} *.java -d ${CMAKE_CURRENT_BINARY_DIR} 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 cmake -E echo "Creating jar"
COMMAND ${JAR} cvf mraa.jar mraa COMMAND ${JAR} cvf mraa.jar mraa
) )
@@ -43,10 +42,5 @@ endif ()
mraa_create_install_pkgconfig (mraajava.pc ${CMAKE_INSTALL_LIBDIR}/pkgconfig) mraa_create_install_pkgconfig (mraajava.pc ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
install (FILES ${CMAKE_CURRENT_BINARY_DIR}/libmraajava.so install (TARGETS mraajava LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
${CMAKE_CURRENT_BINARY_DIR}/mraa.jar install (FILES ${CMAKE_CURRENT_BINARY_DIR}/mraa.jar DESTINATION ${CMAKE_INSTALL_LIBDIR}/../lib/java)
DESTINATION lib/java
)
install (FILES ${CMAKE_CURRENT_BINARY_DIR}/../libmraajava.so
DESTINATION lib/
)