gplugin/gplugin

merging
feature/osx-fixing
2015-12-19, Gary Kramlich
d03aa8e308ea
Parents f8d1f41479042754de76cc30
Children c7cd2fceb281
merging
25 files changed, 121 insertions(+), 51 deletions(-)
  • +6 -4
    CMakeLists.txt
  • +15 -1
    ChangeLog
  • +1 -0
    INSTALL
  • +2 -2
    cmake/Modules/GObjectIntrospection.cmake
  • +6 -6
    gplugin-gtk/CMakeLists.txt
  • +6 -6
    gplugin/CMakeLists.txt
  • +3 -3
    gplugin/gplugin-manager.c
  • +31 -3
    gplugin/gplugin-query.c
  • +1 -1
    gplugin/gplugin.pc.in
  • +1 -1
    gplugin/tests/test-option-group.c
  • +2 -2
    gplugin/tests/test-plugin-manager-paths.c
  • +7 -3
    lua/CMakeLists.txt
  • +4 -2
    lua/tests/CMakeLists.txt
  • +20 -2
    packaging/debian/changelog
  • +3 -3
    packaging/debian/control
  • +1 -1
    packaging/debian/gir1.2-gplugin-0.0.install
  • +2 -2
    packaging/debian/libgplugin-dev.install
  • +3 -2
    packaging/debian/libgplugin-gtk-dev.install
  • +1 -1
    packaging/debian/libgplugin-gtk0.install
  • +1 -1
    packaging/debian/libgplugin-lua.install
  • +1 -1
    packaging/debian/libgplugin-python.install
  • +1 -1
    packaging/debian/libgplugin0.install
  • +1 -1
    perl/CMakeLists.txt
  • +1 -1
    plugins/CMakeLists.txt
  • +1 -1
    python/CMakeLists.txt
    • --- a/CMakeLists.txt Sat Dec 19 23:19:19 2015 -0600
    +++ b/CMakeLists.txt Sat Dec 19 23:19:55 2015 -0600
    @@ -11,13 +11,13 @@
    list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Compatibility)
    endif(${CMAKE_VERSION} VERSION_LESS "2.8.3")
    -if(${CMAKE_VERSION} VERSION_GREATER "2.8.12")
    +if(${CMAKE_VERSION} VERSION_GREATER "3.0.0")
    # allow reading of the LOCATION property
    cmake_policy(SET CMP0026 OLD)
    # don't force target names to match a pattern
    cmake_policy(SET CMP0037 OLD)
    -endif(${CMAKE_VERSION} VERSION_GREATER "2.8.12")
    +endif(${CMAKE_VERSION} VERSION_GREATER "3.0.0")
    ###############################################################################
    # Project Info
    @@ -26,7 +26,7 @@
    set(GPLUGIN_MAJOR_VERSION 0)
    set(GPLUGIN_MINOR_VERSION 0)
    -set(GPLUGIN_MICRO_VERSION 19)
    +set(GPLUGIN_MICRO_VERSION 22)
    set(GPLUGIN_EXTRA_VERSION dev)
    set(GPLUGIN_VERSION ${GPLUGIN_MAJOR_VERSION}.${GPLUGIN_MINOR_VERSION}.${GPLUGIN_MICRO_VERSION}${GPLUGIN_EXTRA_VERSION})
    @@ -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)
    @@ -150,6 +151,7 @@
    -std=c99
    -g -g3
    -DPREFIX="${CMAKE_INSTALL_PREFIX}"
    + -DLIBDIR="${CMAKE_INSTALL_LIBDIR}"
    -DGPLUGIN_WEBSITE="http://bitbucket.org/gplugin/main"
    -Wall
    -Werror=format-security
    @@ -197,7 +199,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/ChangeLog Sat Dec 19 23:19:19 2015 -0600
    +++ b/ChangeLog Sat Dec 19 23:19:55 2015 -0600
    @@ -1,4 +1,18 @@
    -0.0.19:
    +0.0.22:
    +
    +0.0.21: 2015/06/29
    + * Use the GNUInstallDirs cmake module to install everything to the correct
    + locations. - Elliott Sales de Andrade
    + * Added -L, --list option to gplugin-query to show the search paths it is
    + using.
    + * Added an option to toggle whether or not the moonscript tests are run.
    + Defaults to no.
    +
    +0.0.20: 2015/05/07
    + * Fixed the lua dependency checks for Fedora 20
    + * Fixed the build on cmake<3.0.0
    +
    +0.0.19: 2015/05/06
    * Add debug packages to the Debian packaging
    * Add libgplugin-loaders package to the Debian packaging
    * Removed the Seed JavaScript loader (issue #63)
    --- a/INSTALL Sat Dec 19 23:19:19 2015 -0600
    +++ b/INSTALL Sat Dec 19 23:19:55 2015 -0600
    @@ -5,6 +5,7 @@
    gobject-introspection, libgirepository1.0-dev
    cmake >= 2.8
    gettext
    + help2man
    a C compiler
    A full build (enabled by default) depends on the following:
    --- a/cmake/Modules/GObjectIntrospection.cmake Sat Dec 19 23:19:19 2015 -0600
    +++ b/cmake/Modules/GObjectIntrospection.cmake Sat Dec 19 23:19:55 2015 -0600
    @@ -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 Sat Dec 19 23:19:19 2015 -0600
    +++ b/gplugin-gtk/CMakeLists.txt Sat Dec 19 23:19:55 2015 -0600
    @@ -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 Sat Dec 19 23:19:19 2015 -0600
    +++ b/gplugin/CMakeLists.txt Sat Dec 19 23:19:55 2015 -0600
    @@ -243,23 +243,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)
    @@ -267,12 +267,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/gplugin/gplugin-manager.c Sat Dec 19 23:19:19 2015 -0600
    +++ b/gplugin/gplugin-manager.c Sat Dec 19 23:19:55 2015 -0600
    @@ -1119,7 +1119,7 @@
    gplugin_manager_add_default_paths(void) {
    gchar *path;
    - path = g_build_filename(PREFIX, "lib", "gplugin", NULL);
    + path = g_build_filename(PREFIX, LIBDIR, "gplugin", NULL);
    gplugin_manager_prepend_path(path);
    g_free(path);
    @@ -1140,13 +1140,13 @@
    */
    void
    gplugin_manager_add_app_paths(const gchar *prefix,
    - const gchar *appname)
    + const gchar *appname)
    {
    gchar *path;
    g_return_if_fail(appname != NULL);
    - path = g_build_filename(prefix, "lib", appname, NULL);
    + path = g_build_filename(prefix, LIBDIR, appname, NULL);
    gplugin_manager_prepend_path(path);
    g_free(path);
    --- a/gplugin/gplugin-query.c Sat Dec 19 23:19:19 2015 -0600
    +++ b/gplugin/gplugin-query.c Sat Dec 19 23:19:55 2015 -0600
    @@ -29,7 +29,8 @@
    *****************************************************************************/
    static gint verbosity = 0;
    static gboolean show_internal = FALSE;
    -static gboolean version_only = FALSE;
    +static gboolean output_paths = FALSE;
    +static gboolean exit_early = FALSE;
    /******************************************************************************
    * Helpers
    @@ -75,7 +76,18 @@
    {
    printf("gplugin-query %s\n", GPLUGIN_VERSION);
    - version_only = TRUE;
    + exit_early = TRUE;
    +
    + return TRUE;
    +}
    +
    +static gboolean
    +list_cb(GPLUGIN_UNUSED const gchar *n,
    + GPLUGIN_UNUSED const gchar *v,
    + GPLUGIN_UNUSED gpointer d,
    + GPLUGIN_UNUSED GError **e)
    +{
    + output_paths = TRUE;
    return TRUE;
    }
    @@ -252,6 +264,10 @@
    version_cb, N_("Display the version and exit"),
    NULL,
    }, {
    + "list", 'L', G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK,
    + list_cb, N_("Display all search paths and exit"),
    + NULL,
    + }, {
    NULL, 0, 0, 0, NULL, NULL, NULL,
    }
    };
    @@ -286,7 +302,19 @@
    return EXIT_FAILURE;
    }
    - if(version_only) {
    + if(output_paths) {
    + GList *path = NULL;
    +
    + for(path = gplugin_manager_get_paths(); path; path = path->next) {
    + printf("%s\n", (gchar *)path->data);
    + }
    +
    + exit_early = TRUE;
    + }
    +
    + if(exit_early) {
    + gplugin_uninit();
    +
    return 0;
    }
    --- a/gplugin/gplugin.pc.in Sat Dec 19 23:19:19 2015 -0600
    +++ b/gplugin/gplugin.pc.in Sat Dec 19 23:19:55 2015 -0600
    @@ -2,7 +2,7 @@
    libdir=${prefix}/lib
    includedir=${prefix}/include/gplugin-1.0/
    -plugindir=${libdir}
    +plugindir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@
    Name: libgplugin
    Description: A fully featured GModule based plugin library
    --- a/gplugin/tests/test-option-group.c Sat Dec 19 23:19:19 2015 -0600
    +++ b/gplugin/tests/test-option-group.c Sat Dec 19 23:19:55 2015 -0600
    @@ -71,7 +71,7 @@
    GList *paths = NULL;
    gchar *path = NULL;
    - path = g_build_filename(PREFIX, "lib", "gplugin", NULL);
    + path = g_build_filename(PREFIX, LIBDIR, "gplugin", NULL);
    paths = g_list_prepend(paths, path);
    path = g_build_filename(g_get_user_config_dir(), "gplugin", NULL);
    --- a/gplugin/tests/test-plugin-manager-paths.c Sat Dec 19 23:19:19 2015 -0600
    +++ b/gplugin/tests/test-plugin-manager-paths.c Sat Dec 19 23:19:55 2015 -0600
    @@ -92,7 +92,7 @@
    req = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
    /* create and add the paths we are expecting to the table */
    - path = g_build_filename(PREFIX, "lib", "gplugin", NULL);
    + path = g_build_filename(PREFIX, LIBDIR, "gplugin", NULL);
    g_hash_table_insert(req, path, GINT_TO_POINTER(FALSE));
    path = g_build_filename(g_get_user_config_dir(), "gplugin", NULL);
    @@ -127,7 +127,7 @@
    /* build our table of required paths */
    req = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
    - path = g_build_filename(prefix, "lib", appname, NULL);
    + path = g_build_filename(prefix, LIBDIR, appname, NULL);
    g_hash_table_insert(req, path, GINT_TO_POINTER(FALSE));
    path = g_build_filename(g_get_user_config_dir(), appname, "plugins", NULL);
    --- a/lua/CMakeLists.txt Sat Dec 19 23:19:19 2015 -0600
    +++ b/lua/CMakeLists.txt Sat Dec 19 23:19:55 2015 -0600
    @@ -20,8 +20,7 @@
    gplugin-lua-plugin.h
    )
    - set(_LUAS "lua5.2>=5.2.0;lua5.1>=5.1.0;lua>=5.1")
    -
    + set(_LUAS "luajit>=2.0.0;lua>=5.1.0;lua5.2>=5.2.0;lua5.1>=5.1.0")
    # luajit doesn't work on 64bit osx, so only add it to the list if
    # we're not on mac
    if(NOT APPLE)
    @@ -69,6 +68,11 @@
    message(FATAL_ERROR " failed to find the 'lgi' lua module")
    endif(${LUA_LGI_FOUND} EQUAL 0)
    + option(
    + MOONSCRIPT_TESTS
    + "Whether or not to run the moonscript tests"
    + "Off"
    + )
    # now add the library
    add_library(gplugin-lua MODULE
    @@ -83,7 +87,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/lua/tests/CMakeLists.txt Sat Dec 19 23:19:19 2015 -0600
    +++ b/lua/tests/CMakeLists.txt Sat Dec 19 23:19:55 2015 -0600
    @@ -23,8 +23,10 @@
    add_lua_gtest(test-lua-loader)
    target_link_libraries(test-lua-loader gplugin-loader-tests)
    -add_lua_gtest(test-lua-moon-loader)
    -target_link_libraries(test-lua-moon-loader gplugin-loader-tests)
    +if(${MOONSCRIPT_TESTS})
    + add_lua_gtest(test-lua-moon-loader)
    + target_link_libraries(test-lua-moon-loader gplugin-loader-tests)
    +endif(${MOONSCRIPT_TESTS})
    set(GTESTER_LUA_TESTS "${LUA_TESTS}")
    set(GTESTER_LUA_LOG "test-gplugin-lua.xml")
    --- a/packaging/debian/changelog Sat Dec 19 23:19:19 2015 -0600
    +++ b/packaging/debian/changelog Sat Dec 19 23:19:55 2015 -0600
    @@ -1,5 +1,23 @@
    -gplugin (0.0.18) UNRELEASED; urgency=medium
    +gplugin (0.0.21) unstable; urgency=medium
    +
    + * New release, see official changelog
    +
    + -- Gary Kramlich <grim@reaperworld.com> Mon, 29 Jun 2015 21:05:07 -0500
    +
    +gplugin (0.0.20) unstable; urgency=medium
    +
    + * New release, see official changelog
    +
    + -- Gary Kramlich <grim@reaperworld.com> Mon, 29 Jun 2015 21:04:51 -0500
    +
    +gplugin (0.0.19) unstable; urgency=medium
    +
    + * New release, see official changelog
    +
    + -- Gary Kramlich <grim@reaperworld.com> Thu, 07 May 2015 21:50:20 -0500
    +
    +gplugin (0.0.18) unstable; urgency=medium
    * Initial release.
    - -- Gary Kramlich <grim@reaperworld.com> Wed, 14 May 2014 01:31:15 -0500
    + -- Gary Kramlich <grim@reaperworld.com> Wed, 06 May 2015 10:43:35 -0500
    --- a/packaging/debian/control Sat Dec 19 23:19:19 2015 -0600
    +++ b/packaging/debian/control Sat Dec 19 23:19:55 2015 -0600
    @@ -2,10 +2,10 @@
    Section: libs
    Priority: optional
    Maintainer: Gary Kramlich <grim@reaperworld.com>
    -Build-Depends: debhelper (>=9), cmake, libglib2.0-dev,
    +Build-Depends: debhelper (>=9), cmake, libglib2.0-dev, libgtk-3-dev,
    xsltproc, gettext, help2man,
    gobject-introspection, libgirepository1.0-dev,
    - libluajit-5.1-dev, lua-lgi,
    + liblua5.1-0-dev, lua-lgi,
    python3-dev, python-gi-dev, python3-gi
    Homepage: https://bitbucket.org/gplugin/main
    Vcs-Browser: https://bitbucket.org/gplugin/main/src
    @@ -14,7 +14,7 @@
    Package: libgplugin0
    Architecture: any
    -Depends: ${misc:Depends}, ${shlibs:Depends}, libglib-2.0
    +Depends: ${misc:Depends}, ${shlibs:Depends}, libglib2.0-0 (>=2.20.0)
    Recommends: libgplugin-loaders
    Description: GObject based plugin library
    GPlugin is a GObject based library that implements a reusable plugin system
    --- a/packaging/debian/gir1.2-gplugin-0.0.install Sat Dec 19 23:19:19 2015 -0600
    +++ b/packaging/debian/gir1.2-gplugin-0.0.install Sat Dec 19 23:19:55 2015 -0600
    @@ -1,3 +1,3 @@
    -usr/lib/girepository-1.0/
    +usr/lib/*/girepository-1.0/
    usr/share/gir-1.0/
    --- a/packaging/debian/libgplugin-dev.install Sat Dec 19 23:19:19 2015 -0600
    +++ b/packaging/debian/libgplugin-dev.install Sat Dec 19 23:19:55 2015 -0600
    @@ -1,6 +1,6 @@
    usr/include/gplugin-1.0/gplugin
    usr/include/gplugin-1.0/gplugin.h
    usr/include/gplugin-1.0/gplugin-native.h
    -usr/lib/libgplugin.so
    -usr/lib/pkgconfig/gplugin.pc
    +usr/lib/*/libgplugin.so
    +usr/lib/*/pkgconfig/gplugin.pc
    --- a/packaging/debian/libgplugin-gtk-dev.install Sat Dec 19 23:19:19 2015 -0600
    +++ b/packaging/debian/libgplugin-gtk-dev.install Sat Dec 19 23:19:55 2015 -0600
    @@ -1,4 +1,5 @@
    usr/include/gplugin-1.0/gplugin-gtk
    usr/include/gplugin-1.0/gplugin-gtk.h
    -usr/lib/libgplugin-gtk.so
    -usr/lib/pkgconfig/gplugin-gtk.pc usr/lib/pkgconfig
    +usr/lib/*/libgplugin-gtk.so
    +usr/lib/*/pkgconfig/gplugin-gtk.pc
    +
    --- a/packaging/debian/libgplugin-gtk0.install Sat Dec 19 23:19:19 2015 -0600
    +++ b/packaging/debian/libgplugin-gtk0.install Sat Dec 19 23:19:55 2015 -0600
    @@ -1,2 +1,2 @@
    -usr/lib/libgplugin-gtk.so.* usr/lib
    +usr/lib/*/libgplugin-gtk.so.*
    --- a/packaging/debian/libgplugin-lua.install Sat Dec 19 23:19:19 2015 -0600
    +++ b/packaging/debian/libgplugin-lua.install Sat Dec 19 23:19:55 2015 -0600
    @@ -1,2 +1,2 @@
    -usr/lib/gplugin/gplugin-lua.so usr/lib/gplugin
    +usr/lib/*/gplugin/gplugin-lua.so usr/lib/*/gplugin
    --- a/packaging/debian/libgplugin-python.install Sat Dec 19 23:19:19 2015 -0600
    +++ b/packaging/debian/libgplugin-python.install Sat Dec 19 23:19:55 2015 -0600
    @@ -1,2 +1,2 @@
    -usr/lib/gplugin/gplugin-python.so usr/lib/gplugin
    +usr/lib/*/gplugin/gplugin-python.so usr/lib/*/gplugin
    --- a/packaging/debian/libgplugin0.install Sat Dec 19 23:19:19 2015 -0600
    +++ b/packaging/debian/libgplugin0.install Sat Dec 19 23:19:55 2015 -0600
    @@ -1,4 +1,4 @@
    -usr/lib/libgplugin.so.*
    +usr/lib/*/libgplugin.so.*
    usr/bin/gplugin-query
    usr/share/man/man1/gplugin-query.1
    --- a/perl/CMakeLists.txt Sat Dec 19 23:19:19 2015 -0600
    +++ b/perl/CMakeLists.txt Sat Dec 19 23:19:55 2015 -0600
    @@ -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 Sat Dec 19 23:19:19 2015 -0600
    +++ b/plugins/CMakeLists.txt Sat Dec 19 23:19:55 2015 -0600
    @@ -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 Sat Dec 19 23:19:19 2015 -0600
    +++ b/python/CMakeLists.txt Sat Dec 19 23:19:55 2015 -0600
    @@ -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)