chore(cpn): update to Qt 5.15.2 and rework application packaging (#4270)
Co-authored-by: raphaelcoeffic <raphael.coeffic@frafos.com> Co-authored-by: philmoz <phil.a.mitchell@gmail.com>
This commit is contained in:
co-authored by
raphaelcoeffic
philmoz
parent
9d5c6e62cb
commit
a3faf7e9df
@@ -0,0 +1,25 @@
|
||||
# - try to find program dfu-util
|
||||
|
||||
set(DFU_UTIL_ROOT_DIR
|
||||
"${DFU_UTIL_ROOT_DIR}"
|
||||
CACHE
|
||||
PATH
|
||||
"Root directory to search for dfu-util")
|
||||
|
||||
find_program(DFU_UTIL_PROGRAM
|
||||
NAMES
|
||||
dfu-util
|
||||
HINTS
|
||||
"${DFU_UTIL_ROOT_DIR}")
|
||||
|
||||
include(FindPackageHandleStandardArgs)
|
||||
find_package_handle_standard_args(DFU_UTIL
|
||||
DEFAULT_MSG
|
||||
DFU_UTIL_PROGRAM)
|
||||
|
||||
if(DFU_UTIL_FOUND)
|
||||
set(DFU_UTIL_PATH "${DFU_UTIL_PROGRAM}")
|
||||
mark_as_advanced(DFU_UTIL_ROOT_DIR)
|
||||
endif()
|
||||
|
||||
mark_as_advanced(DFU_UTIL_PROGRAM)
|
||||
@@ -0,0 +1,27 @@
|
||||
# - try to find libssl-1 library
|
||||
|
||||
if (DEFINED ENV{LIBSSL1_ROOT_DIR})
|
||||
set(LIBSSL1_ROOT_DIR "$ENV{LIBSSL1_ROOT_DIR}")
|
||||
endif()
|
||||
|
||||
find_library(LIBSSL1_LIBRARY
|
||||
NAMES
|
||||
libssl.so.1.1
|
||||
libssl-1_1.dll
|
||||
libssl-1_1.dylib
|
||||
HINTS
|
||||
"${LIBSSL1_ROOT_DIR}")
|
||||
|
||||
get_filename_component(LIBSSL1_LIBRARY_PATH ${LIBSSL1_LIBRARY} PATH)
|
||||
|
||||
include(FindPackageHandleStandardArgs)
|
||||
find_package_handle_standard_args(LIBSSL1
|
||||
DEFAULT_MSG
|
||||
LIBSSL1_LIBRARY_PATH)
|
||||
|
||||
if(LIBSSL1_FOUND)
|
||||
set(LIBSSL1_LIBRARY_DIR "${LIBSSL1_LIBRARY_PATH}")
|
||||
mark_as_advanced(LIBSSL1_ROOT_DIR)
|
||||
endif()
|
||||
|
||||
mark_as_advanced(LIBSSL1_LIBRARY_PATH)
|
||||
@@ -0,0 +1,31 @@
|
||||
# - try to find libusb-1 library
|
||||
|
||||
set(LIBUSB1_ROOT_DIR
|
||||
"${LIBUSB1_ROOT_DIR}"
|
||||
CACHE
|
||||
PATH
|
||||
"Root directory to search for libusb-1")
|
||||
|
||||
find_library(LIBUSB1_LIBRARY
|
||||
NAMES
|
||||
libusb-1.0
|
||||
libusb-1.0.so
|
||||
libusb-1.0.so.0
|
||||
libusb-1.0.dll
|
||||
libusb-1.0.dylib
|
||||
HINTS
|
||||
"${LIBUSB1_ROOT_DIR}")
|
||||
|
||||
get_filename_component(LIBUSB1_LIBRARY_PATH ${LIBUSB1_LIBRARY} PATH)
|
||||
|
||||
include(FindPackageHandleStandardArgs)
|
||||
find_package_handle_standard_args(LIBUSB1
|
||||
DEFAULT_MSG
|
||||
LIBUSB1_LIBRARY_PATH)
|
||||
|
||||
if(LIBUSB1_FOUND)
|
||||
set(LIBUSB1_LIBRARY_DIR "${LIBUSB1_LIBRARY_PATH}")
|
||||
mark_as_advanced(LIBUSB1_ROOT_DIR)
|
||||
endif()
|
||||
|
||||
mark_as_advanced(LIBUSB1_LIBRARY_PATH)
|
||||
@@ -23,12 +23,40 @@ if(Qt5Core_FOUND OR FOX_FOUND)
|
||||
set(SDL2_BUILDING_LIBRARY YES) # this prevents FindSDL from appending SDLmain lib to the results, which we don't want
|
||||
find_package("SDL2")
|
||||
if(SDL2_FOUND)
|
||||
message(STATUS "SDL2 Lib: ${SDL2_LIBRARIES}; Headers: ${SDL2_INCLUDE_DIRS}")
|
||||
# find_package("SDL2") does not set a variable holding the path to the location of the SDL2 shared library
|
||||
find_file(SDL2_LIB_PATH
|
||||
NAMES
|
||||
libSDL2.so
|
||||
SDL2.dll
|
||||
SDL2.dylib
|
||||
HINTS
|
||||
"/usr/lib/x86_64-linux-gnu"
|
||||
${SDL2_LIBRARY_PATH})
|
||||
message(STATUS "SDL2 Lib: ${SDL2_LIB_PATH} Libs: ${SDL2_LIBRARIES}; Headers: ${SDL2_INCLUDE_DIRS}")
|
||||
else()
|
||||
message(STATUS "SDL not found! Simulator audio, and joystick inputs, will not work.")
|
||||
message(STATUS "SDL2 not found! Simulator audio, and joystick inputs, will not work.")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if(Qt5Core_FOUND AND NOT DISABLE_COMPANION)
|
||||
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})
|
||||
set(OPENSSL_ROOT_DIR "$ENV{OPENSSL_ROOT_DIR}")
|
||||
endif()
|
||||
|
||||
find_package(OpenSSL)
|
||||
endif()
|
||||
|
||||
# Windows-specific includes and libs shared by sub-projects
|
||||
if(WIN32)
|
||||
list(APPEND WIN_INCLUDE_DIRS "${RADIO_SRC_DIR}/thirdparty/windows/dirent")
|
||||
|
||||
Reference in New Issue
Block a user