chore(cpn): upgrade to Ubuntu 22.04 and Qt 6.9.0 (#5986)

Co-authored-by: elecpower <elecpower@users.noreply.github.com>
Co-authored-by: raphaelcoeffic <1050031+raphaelcoeffic@users.noreply.github.com>
This commit is contained in:
Neil Horne
2025-07-23 14:04:19 +02:00
committed by GitHub
co-authored by elecpower raphaelcoeffic
parent 7264b28e62
commit 9e86a3ea84
117 changed files with 4221 additions and 5155 deletions
+9 -8
View File
@@ -24,19 +24,20 @@ else()
message(STATUS "SDL not found! Simulator audio, and joystick inputs, will not work.")
endif()
if(Qt5Core_FOUND AND NOT DISABLE_COMPANION)
if(Qt6Core_FOUND AND NOT DISABLE_COMPANION)
# environment variable set in github workflows and build-edgetx Dockerfile
if(DEFINED ENV{LIBUSB1_ROOT_DIR})
set(LIBUSB1_ROOT_DIR "$ENV{LIBUSB1_ROOT_DIR}")
endif()
find_package(Libusb1)
if(LIBUSB1_FOUND)
find_package(Dfuutil)
endif()
if(LINUX)
find_package(Libssl1)
endif()
# OpenSSL
# environment variable set in github workflows and build-edgetx Dockerfile
if (DEFINED ENV{OPENSSL_ROOT_DIR})
if(DEFINED ENV{OPENSSL_ROOT_DIR})
set(OPENSSL_ROOT_DIR "$ENV{OPENSSL_ROOT_DIR}")
endif()
@@ -61,7 +62,7 @@ add_custom_target(tests-radio
DEPENDS gtests-radio
)
if(Qt5Core_FOUND AND NOT DISABLE_COMPANION)
if(Qt6Core_FOUND AND NOT DISABLE_COMPANION)
add_subdirectory(${COMPANION_SRC_DIRECTORY})
add_custom_target(tests-companion
COMMAND ${CMAKE_CURRENT_BINARY_DIR}/gtests-companion