From 024486c989eca3a7ae679ddd6bd3dd00a7aad94d Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Thu, 15 Jun 2023 19:08:22 -0400 Subject: [PATCH] Maybe fix macOS deployment (intel for now) --- .ci/macos/build.sh | 9 +++++---- CMakeLists.txt | 14 ++++++++++++++ 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/.ci/macos/build.sh b/.ci/macos/build.sh index 1c60015e..18d7912b 100755 --- a/.ci/macos/build.sh +++ b/.ci/macos/build.sh @@ -14,7 +14,7 @@ export CMAKE_PREFIX_PATH cmake -GNinja -S. -Bbuild \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DCMAKE_INSTALL_PREFIX=.deps/usr \ + -DCMAKE_INSTALL_PREFIX="$(pwd)" \ -DHUNTER_ROOT="../.hunter" \ -DHUNTER_ENABLED=ON -DBUILD_SHARED_LIBS=OFF \ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DHUNTER_CONFIGURATION_TYPES=RelWithDebInfo \ @@ -28,7 +28,8 @@ cmake --build build make -j 4 cp libqtjdenticon.dylib ../nheko.app/Contents/MacOS ) - "$(brew --prefix qt6)/bin/macdeployqt" nheko.app -always-overwrite -qmldir=../resources/qml/ - # workaround for https://bugreports.qt.io/browse/QTBUG-100686 - cp "$(brew --prefix brotli)/lib/libbrotlicommon.1.dylib" nheko.app/Contents/Frameworks/libbrotlicommon.1.dylib + # "$(brew --prefix qt6)/bin/macdeployqt" nheko.app -always-overwrite -qmldir=../resources/qml/ + # # workaround for https://bugreports.qt.io/browse/QTBUG-100686 + # cp "$(brew --prefix brotli)/lib/libbrotlicommon.1.dylib" nheko.app/Contents/Frameworks/libbrotlicommon.1.dylib + cmake --install build ) diff --git a/CMakeLists.txt b/CMakeLists.txt index 60cbe6ea..3feb49f5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -804,6 +804,20 @@ if(MAN) add_subdirectory(man) endif() +# potential workaround for macdeployqt issues +if(APPLE) + install(TARGETS nheko + BUNDLE DESTINATION . + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ) + qt_generate_deploy_qml_app_script( + TARGET nheko + OUTPUT_SCRIPT deploy_script + NO_UNSUPPORTED_PLATFORM_ERROR + ) + install(SCRIPT ${deploy_script}) +endif() + if(UNIX AND NOT APPLE) if(FLATPAK) set(APPID "im.nheko.Nheko")