From 62043c18fde9c7e5c0e1489d95cd774701f9aae6 Mon Sep 17 00:00:00 2001 From: pifopi Date: Thu, 2 Oct 2025 23:49:10 +0200 Subject: [PATCH] Update CI --- .github/workflows/cpp-ci-serial-programs.yml | 6 +++--- SerialPrograms/CMakeLists.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cpp-ci-serial-programs.yml b/.github/workflows/cpp-ci-serial-programs.yml index 83a62edad6..16e4bb83d5 100644 --- a/.github/workflows/cpp-ci-serial-programs.yml +++ b/.github/workflows/cpp-ci-serial-programs.yml @@ -9,11 +9,11 @@ jobs: strategy: fail-fast: false matrix: - os: [windows-2025, macos-13, ubuntu-24.04] + os: [windows-2025, macos-15, ubuntu-24.04] compiler: ['default', 'clang'] - qt_version: ['6.9.2'] + qt_version: ['6.9.3'] include: - - qt_version: '6.9.2' + - qt_version: '6.9.3' qt_version_major: '6' qt_modules: 'qtmultimedia qtserialport' diff --git a/SerialPrograms/CMakeLists.txt b/SerialPrograms/CMakeLists.txt index 693cff51c3..8d11d7afc5 100644 --- a/SerialPrograms/CMakeLists.txt +++ b/SerialPrograms/CMakeLists.txt @@ -382,7 +382,7 @@ else() # macOS and Linux 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 ${REPO_ROOT_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 )