From 2059358b90c464652d21df93139ffa5dda751553 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 24 Jul 2013 12:58:53 +0200 Subject: [PATCH] Add possibility to specify custom qt5 modules to a library --- TomahawkAddLibrary.cmake | 5 ++--- src/libtomahawk-widgets/CMakeLists.txt | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/TomahawkAddLibrary.cmake b/TomahawkAddLibrary.cmake index 748bc5697..6a598df53 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 INSTALL_BINDIR) + set(oneValueArgs NAME TYPE EXPORT_MACRO TARGET TARGET_TYPE EXPORT VERSION SOVERSION INSTALL_BINDIR QT5_MODULES) set(multiValueArgs SOURCES UI LINK_LIBRARIES COMPILE_DEFINITIONS) cmake_parse_arguments(LIBRARY "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) set(LIBRARY_NAME ${NAME}) @@ -46,8 +46,7 @@ function(tomahawk_add_library) endif() # HACK: add qt modules - every lib should define its own set of modules - qt5_use_modules(${target} Core Network Widgets Sql Xml DBus) - + qt5_use_modules(${target} Core Network Widgets Sql Xml DBus ${LIBRARY_QT5_MODULES}) # definitions - can this be moved into set_target_properties below? add_definitions(${QT_DEFINITIONS}) diff --git a/src/libtomahawk-widgets/CMakeLists.txt b/src/libtomahawk-widgets/CMakeLists.txt index fe03db118..2639fcabc 100644 --- a/src/libtomahawk-widgets/CMakeLists.txt +++ b/src/libtomahawk-widgets/CMakeLists.txt @@ -21,6 +21,7 @@ list(APPEND ${TOMAHAWK_WIDGETS_LIBRARY_TARGET}_UI tomahawk_add_library(${TOMAHAWK_WIDGETS_LIBRARY_TARGET} SOURCES ${${TOMAHAWK_WIDGETS_LIBRARY_TARGET}_SOURCES} UI ${${TOMAHAWK_WIDGETS_LIBRARY_TARGET}_UI} + QT5_MODULES Concurrent EXPORT TomahawkLibraryDepends VERSION ${TOMAHAWK_VERSION_SHORT} )