diff options
Diffstat (limited to 'peripheral/libmraa/src/java/CMakeLists.txt')
| -rw-r--r-- | peripheral/libmraa/src/java/CMakeLists.txt | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/peripheral/libmraa/src/java/CMakeLists.txt b/peripheral/libmraa/src/java/CMakeLists.txt index fbcbe6e..33ec6af 100644 --- a/peripheral/libmraa/src/java/CMakeLists.txt +++ b/peripheral/libmraa/src/java/CMakeLists.txt @@ -1,4 +1,5 @@ FIND_PACKAGE (JNI REQUIRED) + include_directories ( ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2} @@ -14,7 +15,7 @@ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DJAVACALLBACK") if (NOT DEFINED ENV{JAVA_HOME_NATIVE}) if (NOT DEFINED ENV{JAVA_HOME}) - message (FATAL_ERROR "Neither JAVA_HOME nor JAVA_HOME_NATIVE are set") + message (FATAL_ERROR " - Neither JAVA_HOME nor JAVA_HOME_NATIVE are set") endif() set (JAVA_HOME_NATIVE $ENV{JAVA_HOME}) set (JAVAC $ENV{JAVA_HOME}/bin/javac) @@ -24,8 +25,8 @@ else () set (JAR $ENV{JAVA_HOME_NATIVE}/bin/jar) endif () -swig_add_module (mraajava java mraajava.i mraajni.c) -swig_link_libraries (mraajava ${JAVA_LIBRARIES} mraa) +swig_add_module (mraajava java mraajava.i ${mraa_LIB_SRCS}) +swig_link_libraries (mraajava ${JAVA_LIBRARIES} ${mraa_LIBS}) add_custom_command (TARGET mraajava POST_BUILD @@ -33,7 +34,7 @@ add_custom_command (TARGET mraajava COMMAND cmake -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/mraa COMMAND ${JAVAC} *.java -d ${CMAKE_CURRENT_BINARY_DIR} COMMAND cmake -E echo "Creating jar" - COMMAND ${JAR} cvmf manifest.txt mraa.jar mraa + COMMAND ${JAR} cvf mraa.jar mraa ) if (DOXYGEN_FOUND) @@ -42,7 +43,7 @@ if (DOXYGEN_FOUND) endforeach () endif () -mraa_create_install_pkgconfig (mraajava.pc ${LIB_INSTALL_DIR}/pkgconfig) +mraa_create_install_pkgconfig (mraajava.pc ${CMAKE_INSTALL_LIBDIR}/pkgconfig) -install (TARGETS mraajava LIBRARY DESTINATION ${LIB_INSTALL_DIR}) -install (FILES ${CMAKE_CURRENT_BINARY_DIR}/mraa.jar DESTINATION ${LIB_INSTALL_DIR}/../lib/java) +install (TARGETS mraajava LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) +install (FILES ${CMAKE_CURRENT_BINARY_DIR}/mraa.jar DESTINATION ${CMAKE_INSTALL_LIBDIR}/../lib/java) |