--- CMakeLists.txt.orig 2023-04-29 19:01:20.000000000 +0800 +++ CMakeLists.txt 2023-05-25 02:59:02.000000000 +0800 @@ -7,7 +7,7 @@ set (SO_VERSION "2.4") # Library version (incremented after changes in API or ABI) if (WIN32 OR APPLE OR HAIKU) - set (PROJECT_NAME_GLOBAL "${PROJECT_NAME}") # Package name is the same as project name + set (PROJECT_NAME_GLOBAL "eiskaltdcpp") # Package name is the same as project name else () set (PROJECT_NAME_GLOBAL "eiskaltdcpp") # Simplifies packaging in GNU/Linux distros endif () --- eiskaltdcpp-qt/CMakeLists.txt.orig 2023-04-29 19:01:20.000000000 +0800 +++ eiskaltdcpp-qt/CMakeLists.txt 2023-05-25 02:55:07.000000000 +0800 @@ -187,7 +187,7 @@ ARGS "${TS}" -qm "${QM}") endforeach () -if (WIN32 OR APPLE OR INSTALL_QT_TRANSLATIONS OR BUILD_STATIC) +if (WIN32 OR INSTALL_QT_TRANSLATIONS OR BUILD_STATIC) # Qt translations get_target_property (QtCore_location Qt5::Core LOCATION) get_filename_component (QtCore_DIR "${QtCore_location}" PATH) @@ -548,29 +548,7 @@ if (APPLE) if (USE_QT) - install (DIRECTORY ${QT_LIBRARY_DIR}/QtGui.framework/Resources/qt_menu.nib + install (DIRECTORY ${QT_LIBRARY_DIR}/Resources/qt_menu.nib DESTINATION ${PROJECT_NAME_GLOBAL}.app/Contents/Resources) - - install (CODE " - file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${qtconf_dest_dir}/qt.conf\" \"\")") - - install (CODE " - file(GLOB_RECURSE QTPLUGINS - \"\${CMAKE_INSTALL_PREFIX}/${plugin_dest_dir}/plugins/*${CMAKE_SHARED_LIBRARY_SUFFIX}\") - include(BundleUtilities) - fixup_bundle(\"${APPS}\" \"\${QTPLUGINS}\" \"${DIRS}\")") - elseif (USE_QT5) - if (${_qt5Core_install_prefix} STREQUAL "") - message(WARNING "Warning! \"_qt5Core_install_prefix\" is not set, macdeployqt found in PATH will be used") - set (MACDEPLOYQT "macdeployqt") - else (${_qt5Core_install_prefix} STREQUAL "") - set (MACDEPLOYQT "${_qt5Core_install_prefix}/bin/macdeployqt") - endif (${_qt5Core_install_prefix} STREQUAL "") - install (CODE " - execute_process(COMMAND ${MACDEPLOYQT} ${PROJECT_NAME_GLOBAL}.app -verbose=2 - WORKING_DIRECTORY \${CMAKE_INSTALL_PREFIX})") - endif (USE_QT) - set (CPACK_BINARY_DRAGNDROP ON) + endif () endif (APPLE) - -include(CPack)