d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-22 11:00:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Maybe fix macOS deployment (intel for now)

Browse source
This commit is contained in:
Joseph Donofry 2023-06-15 19:08:22 -04:00
parent 2d75f4a6fd
commit 024486c989
No known key found for this signature in database
GPG key ID: E8A1D78EF044B0CB
2 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
.ci/macos/build.sh
View file

@ -14,7 +14,7 @@ export CMAKE_PREFIX_PATH
cmake -GNinja -S. -Bbuild \ cmake -GNinja -S. -Bbuild \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_INSTALL_PREFIX=.deps/usr \ -DCMAKE_INSTALL_PREFIX="$(pwd)" \
-DHUNTER_ROOT="../.hunter" \ -DHUNTER_ROOT="../.hunter" \
-DHUNTER_ENABLED=ON -DBUILD_SHARED_LIBS=OFF \ -DHUNTER_ENABLED=ON -DBUILD_SHARED_LIBS=OFF \
-DCMAKE_BUILD_TYPE=RelWithDebInfo -DHUNTER_CONFIGURATION_TYPES=RelWithDebInfo \ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DHUNTER_CONFIGURATION_TYPES=RelWithDebInfo \
@ -28,7 +28,8 @@ cmake --build build
make -j 4 make -j 4
cp libqtjdenticon.dylib ../nheko.app/Contents/MacOS cp libqtjdenticon.dylib ../nheko.app/Contents/MacOS
) )
"$(brew --prefix qt6)/bin/macdeployqt" nheko.app -always-overwrite -qmldir=../resources/qml/ # "$(brew --prefix qt6)/bin/macdeployqt" nheko.app -always-overwrite -qmldir=../resources/qml/
# workaround for https://bugreports.qt.io/browse/QTBUG-100686 # # workaround for https://bugreports.qt.io/browse/QTBUG-100686
cp "$(brew --prefix brotli)/lib/libbrotlicommon.1.dylib" nheko.app/Contents/Frameworks/libbrotlicommon.1.dylib # cp "$(brew --prefix brotli)/lib/libbrotlicommon.1.dylib" nheko.app/Contents/Frameworks/libbrotlicommon.1.dylib
cmake --install build
) )

14
CMakeLists.txt
View file

@ -804,6 +804,20 @@ if(MAN)
add_subdirectory(man) add_subdirectory(man)
endif() 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(UNIX AND NOT APPLE)
if(FLATPAK) if(FLATPAK)
set(APPID "im.nheko.Nheko") set(APPID "im.nheko.Nheko")