From 3100c202e80411af5cf5ecc0c8656255975f42cc Mon Sep 17 00:00:00 2001 From: Felix Geyer Date: Wed, 18 Jul 2012 20:58:49 +0200 Subject: [PATCH] Install the auto-type plugin. --- CMakeLists.txt | 15 +++++++++------ src/autotype/x11/CMakeLists.txt | 3 +++ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 65546b9a0..1be5ce91a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -134,14 +134,17 @@ if(APPLE AND "${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr/local") endif() if(MINGW) - set(BIN_INSTALL_DIR ".") - set(DATA_INSTALL_DIR "share") + set(BIN_INSTALL_DIR ".") + set(PLUGIN_INSTALL_DIR ".") + set(DATA_INSTALL_DIR "share") elseif(APPLE) - set(BIN_INSTALL_DIR ".") - set(DATA_INSTALL_DIR "${PROGNAME}.app/Contents/Resources") + set(BIN_INSTALL_DIR ".") + set(PLUGIN_INSTALL_DIR ".") + set(DATA_INSTALL_DIR "${PROGNAME}.app/Contents/Resources") else() - set(BIN_INSTALL_DIR "bin") - set(DATA_INSTALL_DIR "share/keepassx") + set(BIN_INSTALL_DIR "bin") + set(PLUGIN_INSTALL_DIR "lib/keepassx") + set(DATA_INSTALL_DIR "share/keepassx") endif() if(WITH_TESTS) diff --git a/src/autotype/x11/CMakeLists.txt b/src/autotype/x11/CMakeLists.txt index 113e9e0fa..e98355772 100644 --- a/src/autotype/x11/CMakeLists.txt +++ b/src/autotype/x11/CMakeLists.txt @@ -12,3 +12,6 @@ qt4_wrap_cpp(autotype_X11_SOURCES ${autotype_X11_MOC}) add_library(keepassx-autotype-x11 MODULE ${autotype_X11_SOURCES}) target_link_libraries(keepassx-autotype-x11 ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${X11_X11_LIB} ${X11_XTest_LIB}) +install(TARGETS keepassx-autotype-x11 + BUNDLE DESTINATION . COMPONENT Runtime + LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR} COMPONENT Runtime)