From ddf6f3d3e1a8a4be6f75b80bf82adfbf5a4ba4db Mon Sep 17 00:00:00 2001 From: Dominik Schmidt Date: Tue, 23 Jul 2013 22:29:06 +0200 Subject: [PATCH] Install plugins to lib/ even if they are shared libs --- TomahawkAddLibrary.cmake | 11 ++++++++--- TomahawkAddPlugin.cmake | 2 ++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/TomahawkAddLibrary.cmake b/TomahawkAddLibrary.cmake index 7242a7c11..748bc5697 100644 --- a/TomahawkAddLibrary.cmake +++ b/TomahawkAddLibrary.cmake @@ -4,7 +4,7 @@ function(tomahawk_add_library) # parse arguments (name needs to be saved before passing ARGN into the macro) set(NAME ${ARGV0}) set(options NO_INSTALL NO_VERSION) - set(oneValueArgs NAME TYPE EXPORT_MACRO TARGET TARGET_TYPE EXPORT VERSION SOVERSION) + set(oneValueArgs NAME TYPE EXPORT_MACRO TARGET TARGET_TYPE EXPORT VERSION SOVERSION INSTALL_BINDIR) set(multiValueArgs SOURCES UI LINK_LIBRARIES COMPILE_DEFINITIONS) cmake_parse_arguments(LIBRARY "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) set(LIBRARY_NAME ${NAME}) @@ -84,19 +84,24 @@ function(tomahawk_add_library) set_target_properties(${target} PROPERTIES SOVERSION ${LIBRARY_SOVERSION}) endif() + + if(NOT LIBRARY_INSTALL_BINDIR) + set(LIBRARY_INSTALL_BINDIR "${CMAKE_INSTALL_BINDIR}") + endif() + # make installation optional, maybe useful for dummy plugins one day if(NOT LIBRARY_NO_INSTALL) include(GNUInstallDirs) if(NOT LIBRARY_EXPORT) install( TARGETS ${target} - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + RUNTIME DESTINATION ${LIBRARY_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ) else() install( TARGETS ${target} EXPORT ${LIBRARY_EXPORT} - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + RUNTIME DESTINATION ${LIBRARY_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ) diff --git a/TomahawkAddPlugin.cmake b/TomahawkAddPlugin.cmake index 35b529940..a712a7379 100644 --- a/TomahawkAddPlugin.cmake +++ b/TomahawkAddPlugin.cmake @@ -49,5 +49,7 @@ function(tomahawk_add_plugin) list(APPEND tomahawk_add_library_args "NO_VERSION") + list(APPEND tomahawk_add_library_args "INSTALL_BINDIR" "${CMAKE_INSTALL_LIBDIR}") + tomahawk_add_library(${tomahawk_add_library_args}) endfunction()