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. --- quacker/CMakeLists.txt | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'quacker') diff --git a/quacker/CMakeLists.txt b/quacker/CMakeLists.txt index 94d1873..123ee1a 100644 --- a/quacker/CMakeLists.txt +++ b/quacker/CMakeLists.txt @@ -7,12 +7,19 @@ message("-- Configuring Quackle") include("${CMAKE_CURRENT_SOURCE_DIR}/../Settings.cmake") option(BUNDLE "Build app bundle on macOS; does not populate with resources" OFF) +set(QT_VERSION "5" CACHE STRING "Version of Qt (anything past the first digit is ignored)") + add_subdirectory(.. libquackle) add_subdirectory(../quackleio quackleio) add_subdirectory(../data data) -find_package(Qt5 REQUIRED COMPONENTS Core Widgets) +if("${QT_VERSION}" MATCHES "^6") + find_package(Qt6 REQUIRED COMPONENTS Core Widgets) +else() + find_package(Qt5 REQUIRED COMPONENTS Core Widgets) +endif() + set(CMAKE_AUTOMOC ON) set(QUACKLE_SOURCES @@ -97,7 +104,12 @@ else() endif() target_link_libraries(Quackle quackleio libquackle) -target_link_libraries(Quackle Qt5::Core Qt5::Widgets) +if("${QT_VERSION}" MATCHES "^6") + target_link_libraries(Quackle Qt6::Core Qt6::Widgets) +else() + target_link_libraries(Quackle Qt5::Core Qt5::Widgets) +endif() + if(APPLE) target_link_libraries(Quackle "-framework CoreFoundation") -- cgit v1.2.3