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

java: Move mraajava.pc to java folder

Browse Source 
Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
This commit is contained in:
Brendan Le Foll
2016-02-02 10:05:57 +00:00
parent 8ff42482ec
commit 44e705a518
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/CMakeLists.txt
View File

@@ -130,7 +130,6 @@ macro (mraa_CREATE_INSTALL_PKGCONFIG generated_file install_location)
install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${generated_file} DESTINATION ${install_location}) install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${generated_file} DESTINATION ${install_location})
endmacro (mraa_CREATE_INSTALL_PKGCONFIG) endmacro (mraa_CREATE_INSTALL_PKGCONFIG)
mraa_create_install_pkgconfig (mraa.pc ${CMAKE_INSTALL_LIBDIR}/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}) install(TARGETS mraa DESTINATION ${CMAKE_INSTALL_LIBDIR})

6
src/java/CMakeLists.txt
View File

@@ -41,12 +41,12 @@ if (DOXYGEN_FOUND)
endforeach () endforeach ()
endif () endif ()
mraa_create_install_pkgconfig (mraajava.pc ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
install (FILES ${CMAKE_CURRENT_BINARY_DIR}/libmraajava.so install (FILES ${CMAKE_CURRENT_BINARY_DIR}/libmraajava.so
${CMAKE_CURRENT_BINARY_DIR}/mraa.jar
DESTINATION lib/java DESTINATION lib/java
) )
install (FILES ${CMAKE_CURRENT_BINARY_DIR}/../libmraajava.so install (FILES ${CMAKE_CURRENT_BINARY_DIR}/../libmraajava.so
DESTINATION lib/ DESTINATION lib/
) )
install (FILES ${CMAKE_CURRENT_BINARY_DIR}/mraa.jar
DESTINATION lib/java
)

0
src/mraajava.pc.cmake → src/java/mraajava.pc.cmake
View File