From 00c2af7db5c330139f4482dc1d99b45c235d82ec Mon Sep 17 00:00:00 2001 From: John Fultz Date: Sun, 16 Jul 2023 09:27:48 -0500 Subject: Add Qt6 to cmake, build action matrix. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The cmake file now takes a QT_VERSION string setting. The first character of the string is “6”, then cmake calls find_package on Qt6…otherwise, it calls find_package on Qt5. Qt 6.5.2 builds added to the GitHub Actions build matrix. --- quackleio/CMakeLists.txt | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'quackleio') diff --git a/quackleio/CMakeLists.txt b/quackleio/CMakeLists.txt index 460839d..d3f1e0a 100644 --- a/quackleio/CMakeLists.txt +++ b/quackleio/CMakeLists.txt @@ -6,7 +6,13 @@ message("-- Configuring libquackleio") include("${CMAKE_CURRENT_SOURCE_DIR}/../Settings.cmake") -find_package(Qt5 REQUIRED COMPONENTS Core) +set(QT_VERSION "5" CACHE STRING "Version of Qt (anything past the first digit is ignored)") + +if("${QT_VERSION}" MATCHES "^6") + find_package(Qt6 REQUIRED COMPONENTS Core Widgets) +else() + find_package(Qt5 REQUIRED COMPONENTS Core Widgets) +endif() set(QUACKLEIO_SOURCES dawgfactory.cpp @@ -41,4 +47,8 @@ add_library(quackleio ${QUACKLEIO_SOURCES} ${QUACKLEIO_HEADERS} ) target_include_directories(quackleio PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/..") -target_link_libraries(quackleio Qt5::Core) +if("${QT_VERSION}" MATCHES "^6") + target_link_libraries(quackleio Qt6::Core) +else() + target_link_libraries(quackleio Qt5::Core) +endif() -- cgit v1.2.3