From acfad6309d369bb5b85319f84296b23884c685fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?DOTTEL=20Ga=C3=ABl?= Date: Fri, 8 Nov 2024 18:58:56 +0100 Subject: [PATCH] fix CI for qt6 --- .github/workflows/cpp-ci-serial-programs.yml | 2 +- SerialPrograms/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cpp-ci-serial-programs.yml b/.github/workflows/cpp-ci-serial-programs.yml index 46938938d..686a4f81c 100644 --- 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 index 7e4bf8aae..4bb556535 100644 --- 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 )