Merged in qulogic/gplugin/feature/gnu-install-dirs (pull request #1)
Use GNUInstallDirs to determine paths
--- a/CMakeLists.txt Fri May 08 18:37:11 2015 -0500
+++ b/CMakeLists.txt Wed May 13 22:45:48 2015 -0500
@@ -92,6 +92,7 @@
set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:/sw/lib/pkgconfig:/opt/local/lib/pkgconfig")
include(PkgConfigVariable)
@@ -197,7 +198,7 @@
###############################################################################
-install(FILES ChangeLog INSTALL README HACKING DESTINATION share/doc/gplugin)
+install(FILES ChangeLog INSTALL README HACKING DESTINATION ${CMAKE_INSTALL_DOCDIR}) ###############################################################################
--- a/cmake/Modules/GObjectIntrospection.cmake Fri May 08 18:37:11 2015 -0500
+++ b/cmake/Modules/GObjectIntrospection.cmake Wed May 13 22:45:48 2015 -0500
@@ -47,8 +47,8 @@
_pkg_config_variable(girdir GIR_GIRDIR)
_pkg_config_variable(typelibdir GIR_TYPELIBDIR)
- set(GIR_GIRDIR "${CMAKE_INSTALL_PREFIX}/share/gir-1.0")
- set(GIR_TYPELIBDIR "${CMAKE_INSTALL_PREFIX}/lib/girepository-1.0")
+ set(GIR_GIRDIR "${CMAKE_INSTALL_FULL_DATAROOTDIR}/gir-1.0") + set(GIR_TYPELIBDIR "${CMAKE_INSTALL_FULL_LIBDIR}/girepository-1.0") ###############################################################################
--- a/gplugin-gtk/CMakeLists.txt Fri May 08 18:37:11 2015 -0500
+++ b/gplugin-gtk/CMakeLists.txt Wed May 13 22:45:48 2015 -0500
@@ -71,7 +71,7 @@
configure_file(gplugin-gtk.pc.in gplugin-gtk.pc @ONLY)
FILES ${CMAKE_CURRENT_BINARY_DIR}/gplugin-gtk.pc
- DESTINATION lib/pkgconfig
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig ###############################################################################
@@ -96,26 +96,26 @@
-install(TARGETS gplugin-gtk DESTINATION lib)
+install(TARGETS gplugin-gtk DESTINATION ${CMAKE_INSTALL_LIBDIR}) # install the single include into the main directory
FILES ${CMAKE_CURRENT_BINARY_DIR}/gplugin-gtk.h
- DESTINATION include/gplugin-1.0
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gplugin-1.0 # install the normal includes into the gplugin-gtk subdirectory
foreach(HEADER ${GPLUGIN_GTK_HEADERS})
FILES ${CMAKE_CURRENT_SOURCE_DIR}/${HEADER}
- DESTINATION include/gplugin-1.0/gplugin-gtk
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gplugin-1.0/gplugin-gtk # install the GtkBuilder files
FILES gplugin-gtk-plugin-info.ui
- DESTINATION share/gplugin/gplugin-gtk/
+ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/gplugin/gplugin-gtk/ ###############################################################################
@@ -138,6 +138,6 @@
-install(TARGETS gplugin-gtk-viewer RUNTIME DESTINATION bin)
+install(TARGETS gplugin-gtk-viewer RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) --- a/gplugin/CMakeLists.txt Fri May 08 18:37:11 2015 -0500
+++ b/gplugin/CMakeLists.txt Wed May 13 22:45:48 2015 -0500
@@ -248,23 +248,23 @@
###############################################################################
# install the main library
-install(TARGETS gplugin DESTINATION lib)
+install(TARGETS gplugin DESTINATION ${CMAKE_INSTALL_LIBDIR}) -install(TARGETS gplugin-query RUNTIME DESTINATION bin)
+install(TARGETS gplugin-query RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) # install the single includes into the main directory
FILES ${CMAKE_CURRENT_BINARY_DIR}/gplugin.h
${CMAKE_CURRENT_BINARY_DIR}/gplugin-native.h
- DESTINATION include/gplugin-1.0
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gplugin-1.0 # install the normal includes into the gplugin subdirectory
foreach(HEADER ${GPLUGIN_HEADERS} ${GPLUGIN_NATIVE_HEADERS})
FILES ${CMAKE_CURRENT_SOURCE_DIR}/${HEADER}
- DESTINATION include/gplugin-1.0/gplugin
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gplugin-1.0/gplugin @@ -272,12 +272,12 @@
foreach(HEADER ${GPLUGIN_PUBLIC_BUILT_HEADERS})
FILES ${CMAKE_CURRENT_BINARY_DIR}/${HEADER}
- DESTINATION include/gplugin-1.0/gplugin
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gplugin-1.0/gplugin -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/gplugin.pc DESTINATION lib/pkgconfig)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/gplugin.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) ###############################################################################
--- a/lua/CMakeLists.txt Fri May 08 18:37:11 2015 -0500
+++ b/lua/CMakeLists.txt Wed May 13 22:45:48 2015 -0500
@@ -76,7 +76,7 @@
- install(TARGETS gplugin-lua DESTINATION lib/gplugin)
+ install(TARGETS gplugin-lua DESTINATION ${CMAKE_INSTALL_LIBDIR}/gplugin) --- a/perl/CMakeLists.txt Fri May 08 18:37:11 2015 -0500
+++ b/perl/CMakeLists.txt Wed May 13 22:45:48 2015 -0500
@@ -46,7 +46,7 @@
include_directories(${PERL_INCLUDE_PATH})
target_link_libraries(gplugin-perl ${PERL_LIBRARY})
- install(TARGETS gplugin-perl DESTINATION lib/gplugin)
+ install(TARGETS gplugin-perl DESTINATION ${CMAKE_INSTALL_LIBDIR}/gplugin) message(FATAL_ERROR "Failed to find the Perl libraries")
--- a/plugins/CMakeLists.txt Fri May 08 18:37:11 2015 -0500
+++ b/plugins/CMakeLists.txt Wed May 13 22:45:48 2015 -0500
@@ -2,7 +2,7 @@
add_library(${plugin} MODULE ${plugin}.c)
set_target_properties(${plugin} PROPERTIES PREFIX "")
target_link_libraries(${plugin} gplugin)
- install(TARGETS ${plugin} DESTINATION lib/gplugin)
+ install(TARGETS ${plugin} DESTINATION ${CMAKE_INSTALL_LIBDIR}/gplugin) add_plugin(gplugin-license-check)
--- a/python/CMakeLists.txt Fri May 08 18:37:11 2015 -0500
+++ b/python/CMakeLists.txt Wed May 13 22:45:48 2015 -0500
@@ -101,7 +101,7 @@
- install(TARGETS gplugin-python DESTINATION lib/gplugin)
+ install(TARGETS gplugin-python DESTINATION ${CMAKE_INSTALL_LIBDIR}/gplugin)