aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Fabio Bas2015-01-01 21:09:56 +0000
committerGravatar Fabio Bas2015-01-01 21:09:56 +0000
commit7b90617f7f8d58e54697ed2e26df727e0d0cc5bd (patch)
tree3601e775ce0ede2d1c64653bc211969325838404
parentSome work on the wrapper class (diff)
downloadKVIrc-7b90617f7f8d58e54697ed2e26df727e0d0cc5bd.tar.gz
KVIrc-7b90617f7f8d58e54697ed2e26df727e0d0cc5bd.tar.bz2
KVIrc-7b90617f7f8d58e54697ed2e26df727e0d0cc5bd.zip
osx: fix qt's plugin installation in debug mode
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@6429 17fca916-40b9-46aa-a4ea-0a15b648b75c
-rw-r--r--src/kvirc/CMakeLists.txt16
1 files changed, 5 insertions, 11 deletions
diff --git a/src/kvirc/CMakeLists.txt b/src/kvirc/CMakeLists.txt
index 93bf276e5..9c45410ac 100644
--- a/src/kvirc/CMakeLists.txt
+++ b/src/kvirc/CMakeLists.txt
@@ -302,18 +302,12 @@ if(APPLE)
#fixme dirty hack
set(QT_PLUGINS_DIR "${Qt5Widgets_DIR}/../../../plugins")
- # note: no codecs in qt5
- # note: phonon_backend => mediaservice
- # note: needs platform on osx
- # note: check if printsupport is needed, too
+ # qt4: codecs, iconengines, imageformats, phonon_backend, sqldrivers
+ # qt5: audio, iconengines, imageformats, mediaservice, platforms, sqldrivers
- if(WANT_DEBUG)
- install(DIRECTORY "${QT_PLUGINS_DIR}/" DESTINATION ${plugin_dest_dir} COMPONENT Runtime
- FILES_MATCHING REGEX "(codecs|iconengines|imageformats|mediaservice|phonon_backend|platforms|sqldrivers)/.*_debug\\.dylib")
- else()
- install(DIRECTORY "${QT_PLUGINS_DIR}/" DESTINATION ${plugin_dest_dir} COMPONENT Runtime
- FILES_MATCHING REGEX "(codecs|iconengines|imageformats|mediaservice|phonon_backend|platforms|sqldrivers)/[^_]*\\.dylib")
- endif()
+ install(DIRECTORY "${QT_PLUGINS_DIR}/" DESTINATION ${plugin_dest_dir} COMPONENT Runtime
+ FILES_MATCHING REGEX "(audio|codecs|iconengines|imageformats|mediaservice|phonon_backend|platforms|sqldrivers)/.*\\.dylib"
+ REGEX ".*_debug\\.dylib" EXCLUDE)
install(CODE "
file(WRITE \"${qtconf_dest_dir}/qt.conf\" \"[Paths]