refactor: use Qt Required Version rm configure_qt macro for its one use

This commit is contained in:
sithlord48
2024-12-01 21:17:03 -05:00
committed by Chris Rizzitello
parent 4e23460c6f
commit 6498fe5a6b
3 changed files with 5 additions and 13 deletions

View File

@ -94,6 +94,7 @@ message(STATUS "Building ${CMAKE_PROJECT_NAME}-${CMAKE_PROJECT_VERSION}")
set(REQUIRED_OPENSSL_VERSION 3.0)
set(REQUIRED_LIBEI_VERSION 1.3)
set(REQUIRED_LIBPORTAL_VERSION 0.8)
set(REQUIRED_QT_VERSION 6.7.0)
# Set required macOS SDK
if(APPLE)

View File

@ -31,7 +31,9 @@ macro(configure_libs)
)
endif()
configure_qt()
find_package(Qt6 ${REQUIRED_QT_VERSION} REQUIRED COMPONENTS Core Widgets Network)
message(STATUS "Qt version: ${Qt6_VERSION}")
# TODO SSL check can happen in lib/net when we make wix packages with cpack
@ -338,14 +340,3 @@ macro(configure_xorg_libs)
add_definitions(-DWINAPI_XWINDOWS=1)
endmacro()
macro(configure_qt)
find_package(
Qt6
COMPONENTS Core Widgets Network
REQUIRED)
message(STATUS "Qt version: ${Qt6_VERSION}")
endmacro()

View File

@ -103,7 +103,7 @@ add_library(arch STATIC ${PLATFORM_CODE}
if(UNIX)
target_link_libraries(arch ${CMAKE_DL_LIBS} ${libs})
if(NOT APPLE)
find_package(Qt6 COMPONENTS DBus)
find_package(Qt6 ${REQUIRED_QT_VERSION} REQUIRED COMPONENTS DBus)
target_link_libraries(arch Qt6::DBus)
endif()
endif()