Skip to content
Snippets Groups Projects
Verified Commit 024486c9 authored by Joe Donofry's avatar Joe Donofry
Browse files

Maybe fix macOS deployment (intel for now)

parent 2d75f4a6
No related branches found
No related tags found
No related merge requests found
Pipeline #4914 failed
...@@ -14,7 +14,7 @@ export CMAKE_PREFIX_PATH ...@@ -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 ...@@ -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
) )
...@@ -804,6 +804,20 @@ if(MAN) ...@@ -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")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment