fix CI for qt6

pifopi · pifopi · commit acfad6309d36 · 2024-11-08T20:01:15.000+01:00
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
         )

Original file line number	Diff line number	Diff line change
`@@ -2156,7 +2156,7 @@ else()`
`2156`	`2156`	`if ((APPLE) AND (CMAKE_SYSTEM_PROCESSOR MATCHES "(arm64)\|(ARM64)"))`
`2157`	`2157`	`add_library(libdpp STATIC IMPORTED)`
`2158`	`2158`	`set_target_properties(libdpp PROPERTIES`
`2159`		`- IMPORTED_LOCATION ../3rdPartyBinaries/libdpp_macos_arm64.a`
	`2159`	`+ IMPORTED_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/../3rdPartyBinaries/libdpp_macos_arm64.a"`
`2160`	`2160`	`INTERFACE_COMPILE_DEFINITIONS "PA_DPP"`
`2161`	`2161`	`INTERFACE_LINK_LIBRARIES "-L/opt/homebrew/lib -lssl -lcrypto -lopus -lsodium -lz" # add dpp's deps`
`2162`	`2162`	`)`