diff --git a/CoreApp/CMakeLists.txt b/CoreApp/CMakeLists.txt index 6e0c0836e793ff12e2225f29f751ff7bdcfc64b4..947de0911525a09323551a6db6b6e2475776314c 100644 --- a/CoreApp/CMakeLists.txt +++ b/CoreApp/CMakeLists.txt @@ -247,9 +247,8 @@ if ( APPLE ) acg_copy_after_build( OpenFlipper "/opt/local/libexec/qt4-mac/lib/QtGui.framework/Versions/4/Resources/qt_menu.nib" "${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_DATADIR}/qt_menu.nib") endif () - - - + # Copy qt plugins into bundle + acg_copy_after_build ( OpenFlipper "${QT_PLUGINS_DIR}" "${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_DATADIR}/QtPlugins") endif( APPLE ) diff --git a/cmake/fixbundle.cmake.in b/cmake/fixbundle.cmake.in index c4b7603f81e7d506b2f4ef5c5b34d03013f9f2a6..fc1e9128b0d3bb665e350ca47cfaf4e8cf578847 100644 --- a/cmake/fixbundle.cmake.in +++ b/cmake/fixbundle.cmake.in @@ -41,7 +41,7 @@ include (BundleUtilities) # copy qt plugins to bundle file (GLOB _plugins "@CMAKE_BINARY_DIR@/Build/OpenFlipper.app/Contents/Resources/Plugins/*.so") -file (GLOB_RECURSE _qtplugins "@QT_PLUGINS_DIR@/*.bundle") +file (GLOB_RECURSE _qtplugins "@CMAKE_BINARY_DIR@/Build/OpenFlipper.app/Contents/Resources/QtPlugins/*.dylib") foreach (_qtp ${_qtplugins}) get_filename_component(_dir "${_qtp}" PATH) list(APPEND _qtdirs "${_dir}")