--- src/gui/CMakeLists.txt 2020-12-16 07:37:48 +++ src/gui/CMakeLists.txt 2023-12-29 15:08:25 @@ -227,8 +227,8 @@ elseif(APPLE) install(TARGETS ${PROJECT_NAME} BUNDLE DESTINATION ${CMAKE_INSTALL_PREFIX}) - set(QT_LIBS_DIR "${Qt5Widgets_DIR}/../..") - set(QT_PLUGINS_DIR "${QT_LIBS_DIR}/../plugins") + set(QT_LIBS_DIR "@qt_libs_dir@") + set(QT_PLUGINS_DIR "@qt_plugins_dir@") install(FILES "${QT_PLUGINS_DIR}/platforms/libqcocoa.dylib" DESTINATION "${MAC_BUNDLE_PATH}/Contents/plugins/platforms") @@ -249,23 +249,7 @@ DESTINATION "${MAC_BUNDLE_PATH}/Contents" FILES_MATCHING PATTERN "qtbase_*.qm") - if(EXISTS "/usr/local/bin/ffmpeg") - install(PROGRAMS - "/usr/local/bin/ffmpeg" - DESTINATION "${MAC_BUNDLE_PATH}/Contents/MacOS") - else() - message(WARNING "FFmpeg executable not copied!") - endif() - install(CODE " - include(BundleUtilities) - set(BU_CHMOD_BUNDLE_ITEMS ON) - list(APPEND DIRS /usr/local/lib ${QT_LIBS_DIR}) - file(GLOB_RECURSE QMPLAY2_MODULES_AND_QT_PLUGINS - \"${MAC_BUNDLE_PATH}/Contents/MacOS/modules/*\" - \"${MAC_BUNDLE_PATH}/Contents/plugins/*.dylib\") - file(WRITE \"${MAC_BUNDLE_PATH}/Contents/Resources/qt.conf\") - fixup_bundle(${MAC_BUNDLE_PATH} \"\${QMPLAY2_MODULES_AND_QT_PLUGINS}\" \"\${DIRS}\") - ") + file(WRITE \"@destroot@${MAC_BUNDLE_PATH}/Contents/Resources/qt.conf\") else() # executable install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})