fix CI for qt6

PokemonAutomation · Nov 8, 2024 · acfad63 · acfad63
1 parent 9811e3d
commit acfad63
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/cpp-ci-serial-programs.yml b/.github/workflows/cpp-ci-serial-programs.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-2022, macos-15-large, ubuntu-24.04]
+        os: [windows-2022, macos-15, ubuntu-24.04]
         qt_version: ['5.12.12', '6.7.2']
         include:
         - qt_version: '5.12.12'

diff --git a/SerialPrograms/CMakeLists.txt b/SerialPrograms/CMakeLists.txt
@@ -2156,7 +2156,7 @@ else()
     if ((APPLE) AND (CMAKE_SYSTEM_PROCESSOR MATCHES "(arm64)|(ARM64)"))
         add_library(libdpp STATIC IMPORTED)
         set_target_properties(libdpp PROPERTIES
-            IMPORTED_LOCATION ../3rdPartyBinaries/libdpp_macos_arm64.a
+            IMPORTED_LOCATION  "${CMAKE_CURRENT_SOURCE_DIR}/../3rdPartyBinaries/libdpp_macos_arm64.a"
             INTERFACE_COMPILE_DEFINITIONS "PA_DPP"
             INTERFACE_LINK_LIBRARIES "-L/opt/homebrew/lib -lssl -lcrypto -lopus -lsodium -lz" # add dpp's deps
         )