From 8f1bb288f366d2c5414861473fab6e21fd59ce29 Mon Sep 17 00:00:00 2001 From: Sergey Fedorov Date: Mon, 25 Dec 2023 15:58:27 +0800 Subject: [PATCH] Fix Qt paths diff --git src/gui/CMakeLists.txt src/gui/CMakeLists.txt index 1ee4f913..85568be3 100644 --- src/gui/CMakeLists.txt +++ src/gui/CMakeLists.txt @@ -216,11 +216,8 @@ if(WIN32) 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") - install(FILES - "${QT_PLUGINS_DIR}/platforms/libqcocoa.dylib" - DESTINATION "${MAC_BUNDLE_PATH}/Contents/plugins/platforms") + set(QT_LIBS_DIR "@qt_libs_dir@") + set(QT_PLUGINS_DIR "@qt_plugins_dir@") install(FILES "${QT_PLUGINS_DIR}/iconengines/libqsvgicon.dylib" DESTINATION "${MAC_BUNDLE_PATH}/Contents/plugins/iconengines") @@ -234,16 +231,7 @@ elseif(APPLE) DESTINATION "${MAC_BUNDLE_PATH}/Contents" FILES_MATCHING PATTERN "qtbase_*.qm") - 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})