From 74c58cc2b08d2c8e5acd8c3171d8c97a6ac0dbaa Mon Sep 17 00:00:00 2001 From: Fabio Bas Date: Thu, 1 Oct 2015 23:16:46 +0200 Subject: [PATCH] fix qt libraries bundling on osx fix #1547 --- cockatrice/CMakeLists.txt | 1 + oracle/CMakeLists.txt | 1 + servatrice/CMakeLists.txt | 1 + 3 files changed, 3 insertions(+) diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt index f9657ced..2a600e1b 100644 --- a/cockatrice/CMakeLists.txt +++ b/cockatrice/CMakeLists.txt @@ -281,6 +281,7 @@ if(APPLE) # these needs to be relative to CMAKE_INSTALL_PREFIX set(plugin_dest_dir cockatrice.app/Contents/Plugins) set(qtconf_dest_dir cockatrice.app/Contents/Resources) + get_filename_component(QT_LIBRARY_DIR "${QT_LIBRARY_DIR}/.." ABSOLUTE) # qt4: codecs, iconengines, imageformats # qt5: audio, iconengines, imageformats, platforms, printsupport diff --git a/oracle/CMakeLists.txt b/oracle/CMakeLists.txt index e927bda5..1440ee24 100644 --- a/oracle/CMakeLists.txt +++ b/oracle/CMakeLists.txt @@ -185,6 +185,7 @@ if(APPLE) # these needs to be relative to CMAKE_INSTALL_PREFIX set(plugin_dest_dir oracle.app/Contents/Plugins) set(qtconf_dest_dir oracle.app/Contents/Resources) + get_filename_component(QT_LIBRARY_DIR "${QT_LIBRARY_DIR}/.." ABSOLUTE) # qt4: codecs, iconengines, imageformats # qt5: iconengines, platforms diff --git a/servatrice/CMakeLists.txt b/servatrice/CMakeLists.txt index 047a3f53..eb30b011 100644 --- a/servatrice/CMakeLists.txt +++ b/servatrice/CMakeLists.txt @@ -146,6 +146,7 @@ if(APPLE) # these needs to be relative to CMAKE_INSTALL_PREFIX set(plugin_dest_dir servatrice.app/Contents/Plugins) set(qtconf_dest_dir servatrice.app/Contents/Resources) + get_filename_component(QT_LIBRARY_DIR "${QT_LIBRARY_DIR}/.." ABSOLUTE) # qt4: codecs, sqldrivers # qt5: platforms, sqldrivers