From 1fa21af38ec154503dfd5e98034586fcdcd5b5d5 Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Mon, 24 Oct 2022 21:04:36 -0400 Subject: [PATCH] Move OSX deployment target to toolchain file for hunter; add codesign debug --- .ci/macos/build.sh | 3 +-- .ci/macos/notarize.sh | 3 +++ toolchain.cmake | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.ci/macos/build.sh b/.ci/macos/build.sh index 56fb892b..ef95181c 100755 --- a/.ci/macos/build.sh +++ b/.ci/macos/build.sh @@ -19,8 +19,7 @@ cmake -GNinja -S. -Bbuild \ -DHUNTER_ENABLED=ON -DBUILD_SHARED_LIBS=OFF \ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DHUNTER_CONFIGURATION_TYPES=RelWithDebInfo \ -DUSE_BUNDLED_OPENSSL=ON \ - -DCI_BUILD=ON \ - -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 + -DCI_BUILD=ON cmake --build build ( cd build || exit git clone https://github.com/Nheko-Reborn/qt-jdenticon.git diff --git a/.ci/macos/notarize.sh b/.ci/macos/notarize.sh index a66777b8..a397c1c3 100755 --- a/.ci/macos/notarize.sh +++ b/.ci/macos/notarize.sh @@ -41,6 +41,7 @@ find "build/nheko.app/Contents"|while read -r fname; do done codesign --force --timestamp --options=runtime --sign "${APPLE_DEV_IDENTITY}" "build/nheko.app" +codesign -vvv --deep --strict "build/nheko.app" NOTARIZE_SUBMIT_LOG=$(mktemp /tmp/notarize-submit.XXXXXX) NOTARIZE_STATUS_LOG=$(mktemp /tmp/notarize-status.XXXXXX) @@ -52,6 +53,8 @@ trap finish EXIT dmgbuild -s .ci/macos/settings.json "Nheko" nheko.dmg codesign -s "${APPLE_DEV_IDENTITY}" nheko.dmg +codesign -vvv --deep --strict nheko.dmg + user=$(id -nu) chown "${user}" nheko.dmg diff --git a/toolchain.cmake b/toolchain.cmake index 90f05868..3e80767f 100644 --- a/toolchain.cmake +++ b/toolchain.cmake @@ -1,3 +1,4 @@ set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_POSITION_INDEPENDENT_CODE ON) +set(CMAKE_OSX_DEPLOYMENT_TARGET 10.15) \ No newline at end of file