Fix compilation on macOS CI

oclero · May 5, 2024 · 64c0a3e · 64c0a3e
1 parent d335dbb
commit 64c0a3e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -21,13 +21,13 @@ jobs:
       - name: Install Qt
         uses: jurplel/install-qt-action@v3
         with:
-          version: "5.15.2"
+          version: '5.15.2'
           host: mac
           target: desktop
           arch: clang_64
 
       - name: Configure CMake
-        run: cmake --preset macos -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED=OFF -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY=""
+        run: cmake --preset macos -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED=OFF -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY="" -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGN_STYLE="Manual"
 
       - name: Build the library.
         run: cmake --build --preset macos

diff --git a/CMakePresets.json b/CMakePresets.json
@@ -13,7 +13,7 @@
       "generator": "Xcode",
       "binaryDir": "${sourceDir}/_build",
       "cacheVariables": {
-        "QT_DIR": "/opt/homebrew/opt/qt/lib/cmake/Qt6"
+        "QT_DIR": "/opt/homebrew/opt/qt/lib/cmake/Qt5"
       },
       "condition": {
         "type": "equals",

diff --git a/cmake/DeployQt.cmake b/cmake/DeployQt.cmake
@@ -36,6 +36,10 @@ function(target_deploy_qt TARGET_NAME)
           COMMAND ${CMAKE_COMMAND} -E echo "Deploying Qt..."
           COMMAND ${QTDEPLOY_TARGET_NAME} "$<TARGET_BUNDLE_DIR:${TARGET_NAME}>" -verbose=0
         )
+        add_custom_command(TARGET ${TARGET_NAME} POST_BUILD
+          COMMAND ${CMAKE_COMMAND} -E echo "Removing unwanted codesigning made by macdeployqt..."
+          COMMAND codesign --remove-signature "$<TARGET_BUNDLE_DIR:${TARGET_NAME}>"
+        )
       endif()
     endif()
   endif()

diff --git a/sandbox/CMakeLists.txt b/sandbox/CMakeLists.txt
@@ -50,8 +50,10 @@ set_target_properties(${SANDBOX_NAME} PROPERTIES
   MACOSX_BUNDLE_ICON_FILE "icon.icns"
   MACOSX_BUNDLE_COPYRIGHT ${PROJECT_COPYRIGHT}
 
-  XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED OFF
-  XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "-"
+  XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "${XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED}"
+  XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "${XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY}"
+  XCODE_ATTRIBUTE_CODE_SIGN_STYLE "${XCODE_ATTRIBUTE_CODE_SIGN_STYLE}"
+  XCODE_ATTRIBUTE_CODE_SIGN_INJECT_BASE_ENTITLEMENTS OFF
 )
 
 target_deploy_qt(sandbox)