gplugin/gplugin

build: Use GNUInstallDirs for destination paths.
feature/gnu-install-dirs
2015-05-13, Elliott Sales de Andrade
56ccbe568105
Parents c61de4a5f725
Children bf27a9f96127de26c99022f5
build: Use GNUInstallDirs for destination paths.

This allows the user (most likely packagers only) to override certain
locations in a manner that follows GNU conventions.
8 files changed, 20 insertions(+), 19 deletions(-)
  • +2 -1
    CMakeLists.txt
  • +2 -2
    cmake/Modules/GObjectIntrospection.cmake
  • +6 -6
    gplugin-gtk/CMakeLists.txt
  • +6 -6
    gplugin/CMakeLists.txt
  • +1 -1
    lua/CMakeLists.txt
  • +1 -1
    perl/CMakeLists.txt
  • +1 -1
    plugins/CMakeLists.txt
  • +1 -1
    python/CMakeLists.txt
    • --- a/CMakeLists.txt Wed May 13 00:35:44 2015 -0400
    +++ b/CMakeLists.txt Wed May 13 00:44:53 2015 -0400
    @@ -92,6 +92,7 @@
    set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:/sw/lib/pkgconfig:/opt/local/lib/pkgconfig")
    endif(APPLE)
    +include(GNUInstallDirs)
    include(FindPkgConfig)
    include(PkgConfigVariable)
    include(help2man)
    @@ -197,7 +198,7 @@
    # Install stuff
    ###############################################################################
    # documentation
    -install(FILES ChangeLog INSTALL README HACKING DESTINATION share/doc/gplugin)
    +install(FILES ChangeLog INSTALL README HACKING DESTINATION ${CMAKE_INSTALL_DOCDIR})
    ###############################################################################
    # make dist
    --- a/cmake/Modules/GObjectIntrospection.cmake Wed May 13 00:35:44 2015 -0400
    +++ b/cmake/Modules/GObjectIntrospection.cmake Wed May 13 00:44:53 2015 -0400
    @@ -47,8 +47,8 @@
    _pkg_config_variable(girdir GIR_GIRDIR)
    _pkg_config_variable(typelibdir GIR_TYPELIBDIR)
    else(_INSTALL_PREFIX)
    - 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")
    endif(_INSTALL_PREFIX)
    ###############################################################################
    --- a/gplugin-gtk/CMakeLists.txt Wed May 13 00:35:44 2015 -0400
    +++ b/gplugin-gtk/CMakeLists.txt Wed May 13 00:44:53 2015 -0400
    @@ -71,7 +71,7 @@
    configure_file(gplugin-gtk.pc.in gplugin-gtk.pc @ONLY)
    install(
    FILES ${CMAKE_CURRENT_BINARY_DIR}/gplugin-gtk.pc
    - DESTINATION lib/pkgconfig
    + DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
    )
    ###############################################################################
    @@ -96,26 +96,26 @@
    gplugin
    )
    -install(TARGETS gplugin-gtk DESTINATION lib)
    +install(TARGETS gplugin-gtk DESTINATION ${CMAKE_INSTALL_LIBDIR})
    # install the single include into the main directory
    install(
    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})
    install(
    FILES ${CMAKE_CURRENT_SOURCE_DIR}/${HEADER}
    - DESTINATION include/gplugin-1.0/gplugin-gtk
    + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gplugin-1.0/gplugin-gtk
    )
    endforeach(HEADER)
    # install the GtkBuilder files
    install(
    FILES gplugin-gtk-plugin-info.ui
    - DESTINATION share/gplugin/gplugin-gtk/
    + DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/gplugin/gplugin-gtk/
    )
    ###############################################################################
    @@ -138,6 +138,6 @@
    HELP_OPTION --help-all
    )
    -install(TARGETS gplugin-gtk-viewer RUNTIME DESTINATION bin)
    +install(TARGETS gplugin-gtk-viewer RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
    endif(BUILD_GTK3)
    --- a/gplugin/CMakeLists.txt Wed May 13 00:35:44 2015 -0400
    +++ b/gplugin/CMakeLists.txt Wed May 13 00:44:53 2015 -0400
    @@ -248,23 +248,23 @@
    # Install Stuff
    ###############################################################################
    # install the main library
    -install(TARGETS gplugin DESTINATION lib)
    +install(TARGETS gplugin DESTINATION ${CMAKE_INSTALL_LIBDIR})
    # install gplugin-query
    -install(TARGETS gplugin-query RUNTIME DESTINATION bin)
    +install(TARGETS gplugin-query RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
    # install the single includes into the main directory
    install(
    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})
    install(
    FILES ${CMAKE_CURRENT_SOURCE_DIR}/${HEADER}
    - DESTINATION include/gplugin-1.0/gplugin
    + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gplugin-1.0/gplugin
    )
    endforeach(HEADER)
    @@ -272,12 +272,12 @@
    foreach(HEADER ${GPLUGIN_PUBLIC_BUILT_HEADERS})
    install(
    FILES ${CMAKE_CURRENT_BINARY_DIR}/${HEADER}
    - DESTINATION include/gplugin-1.0/gplugin
    + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gplugin-1.0/gplugin
    )
    endforeach(HEADER)
    # pkg-config files
    -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/gplugin.pc DESTINATION lib/pkgconfig)
    +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/gplugin.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
    ###############################################################################
    # subdirectories
    --- a/lua/CMakeLists.txt Wed May 13 00:35:44 2015 -0400
    +++ b/lua/CMakeLists.txt Wed May 13 00:44:53 2015 -0400
    @@ -76,7 +76,7 @@
    gplugin
    )
    - install(TARGETS gplugin-lua DESTINATION lib/gplugin)
    + install(TARGETS gplugin-lua DESTINATION ${CMAKE_INSTALL_LIBDIR}/gplugin)
    endif(BUILD_LUA)
    if(TESTING_ENABLED)
    --- a/perl/CMakeLists.txt Wed May 13 00:35:44 2015 -0400
    +++ b/perl/CMakeLists.txt Wed May 13 00:44:53 2015 -0400
    @@ -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)
    else(PERLLIBS_FOUND)
    message(FATAL_ERROR "Failed to find the Perl libraries")
    endif(PERLLIBS_FOUND)
    --- a/plugins/CMakeLists.txt Wed May 13 00:35:44 2015 -0400
    +++ b/plugins/CMakeLists.txt Wed May 13 00:44:53 2015 -0400
    @@ -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)
    endmacro(add_plugin)
    add_plugin(gplugin-license-check)
    --- a/python/CMakeLists.txt Wed May 13 00:35:44 2015 -0400
    +++ b/python/CMakeLists.txt Wed May 13 00:44:53 2015 -0400
    @@ -101,7 +101,7 @@
    gplugin
    )
    - install(TARGETS gplugin-python DESTINATION lib/gplugin)
    + install(TARGETS gplugin-python DESTINATION ${CMAKE_INSTALL_LIBDIR}/gplugin)
    endif(BUILD_PYTHON)
    if(TESTING_ENABLED)