java: Move mraajava.pc to java folder

Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
2016-02-02 10:05:57 +00:00
parent 8ff42482ec
commit 44e705a518
3 changed files with 3 additions and 4 deletions
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -130,7 +130,6 @@ macro (mraa_CREATE_INSTALL_PKGCONFIG generated_file install_location)
  install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${generated_file} DESTINATION ${install_location})
 endmacro (mraa_CREATE_INSTALL_PKGCONFIG)
 mraa_create_install_pkgconfig (mraa.pc ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
-mraa_create_install_pkgconfig (mraajava.pc ${CMAKE_INSTALL_LIBDIR}/pkgconfig)

 install(TARGETS mraa DESTINATION ${CMAKE_INSTALL_LIBDIR})

--- a/src/java/CMakeLists.txt
+++ b/src/java/CMakeLists.txt
@@ -41,12 +41,12 @@ if (DOXYGEN_FOUND)
  endforeach ()
 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 (FILES ${CMAKE_CURRENT_BINARY_DIR}/mraa.jar
-		DESTINATION lib/java
-)
--- a/src/java/mraajava.pc.cmake
+++ b/src/java/mraajava.pc.cmake