Fix double nested nheko folder

This commit is contained in:
Nicolas Werner 2023-06-19 19:30:47 +02:00
parent 3e34f9de61
commit b15d889da0
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9

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="nheko.app" \ -DCMAKE_INSTALL_PREFIX="nheko.temp" \
-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 \
@ -27,9 +27,11 @@ cmake --install build
( cd qt-jdenticon ( cd qt-jdenticon
qmake qmake
make -j 4 make -j 4
cp libqtjdenticon.dylib ../../nheko.app/Contents/MacOS cp libqtjdenticon.dylib ../../nheko.temp/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
) )
mv nheko.temp/nheko.app nheko.app