CMake: Make Qt 6 the default

Invert the logic and assume Qt 6 unless -DBUILD_WITH_QT5=ON is passed.

Author: frankosterfeld

.github/workflows/build.yml

@@ -109,16 +109,14 @@ jobs:
             -DCMAKE_BUILD_TYPE=Release `
             -DCMAKE_INSTALL_PREFIX="${{ github.workspace }}/install" `
             -DCMAKE_PREFIX_PATH=$env:QT_ROOT_DIR `
-            ${{ matrix.qt_version == 'qt6' && '-DBUILD_WITH_QT6=true' || '' }}
-
-      - name: Run CMake (Mac/Linux Only)
+            ${{ matrix.qt_version == 'qt5' && '-DBUILD_WITH_QT5=ON' || '' }}
         if: runner.os != 'Windows'
         run: |
           cd ${{ github.workspace }}/work/build/${{ github.event.repository.name }}
           cmake -G Ninja ${{ github.workspace }} \
             -DCMAKE_BUILD_TYPE=Release \
             -DCMAKE_INSTALL_PREFIX="${{ github.workspace }}/install" \
-            ${{ matrix.qt_version == 'qt6' && '-DBUILD_WITH_QT6=true' || '' }}
+            ${{ matrix.qt_version == 'qt5' && '-DBUILD_WITH_QT5=ON' || '' }}
 
       - name: Build and Install
         run: |
@@ -162,7 +160,6 @@ jobs:
           cmake -S ${{ github.workspace }} -B build/qtkeychain \
             -DCMAKE_TOOLCHAIN_FILE=$QT_ROOT_DIR/lib/cmake/Qt6/qt.toolchain.cmake \
             -DCMAKE_BUILD_TYPE=Release \
-            -DBUILD_WITH_QT6=ON \
             -DBUILD_TRANSLATIONS=OFF
           cmake --build build/qtkeychain
           cmake --install build/qtkeychain --prefix ${{ github.workspace }}/install
@@ -172,8 +169,7 @@ jobs:
           cmake -S ${{ github.workspace }}/TestAppExample -B build/testapp \
             -DCMAKE_TOOLCHAIN_FILE=$QT_ROOT_DIR/lib/cmake/Qt6/qt.toolchain.cmake \
             -DCMAKE_BUILD_TYPE=Release \
-            -DQt6Keychain_DIR=${{ github.workspace }}/install/lib/cmake/Qt6Keychain \
-            -DBUILD_WITH_QT6=ON
+            -DQt6Keychain_DIR=${{ github.workspace }}/install/lib/cmake/Qt6Keychain
           cmake --build build/testapp
 
   build-ios:
@@ -199,7 +195,6 @@ jobs:
           cmake -S ${{ github.workspace }} -B build/qtkeychain \
             -G Xcode \
             -DCMAKE_TOOLCHAIN_FILE=$QT_ROOT_DIR/lib/cmake/Qt6/qt.toolchain.cmake \
-            -DBUILD_WITH_QT6=ON \
             -DBUILD_TRANSLATIONS=OFF \
             -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED=NO \
             -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED=NO
@@ -212,7 +207,6 @@ jobs:
             -G Xcode \
             -DCMAKE_TOOLCHAIN_FILE=$QT_ROOT_DIR/lib/cmake/Qt6/qt.toolchain.cmake \
             -DQt6Keychain_DIR=${{ github.workspace }}/install/lib/cmake/Qt6Keychain \
-            -DBUILD_WITH_QT6=ON \
             -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED=NO \
             -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED=NO
           cmake --build build/testapp --config Release

CMakeLists.txt

@@ -5,12 +5,6 @@ set(QTKEYCHAIN_SOVERSION 1)
 
 project(qtkeychain VERSION ${QTKEYCHAIN_VERSION} LANGUAGES CXX)
 
-if(BUILD_WITH_QT6)
-    set(CMAKE_CXX_STANDARD 17) # qt6 requires a c++17 compiler
-else()
-    set(CMAKE_CXX_STANDARD 11)
-endif()
-
 include(FindPkgConfig)
 
 ###
@@ -36,7 +30,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL Haiku)
     set(HAIKU 1)
 endif()
 
-option(BUILD_WITH_QT6 "Build qtkeychain with Qt 6" OFF)
+option(BUILD_WITH_QT5 "Build qtkeychain with Qt 5 (default is Qt 6)" OFF)
 option(BUILD_TEST_APPLICATION "Build test application (CLI)" OFF)
 option(BUILD_QTQUICK_DEMO "Build QtQuick demo application" OFF)
 option(BUILD_TRANSLATIONS "Build translations" ON)
@@ -56,13 +50,18 @@ if (WIN32)
     endif()
 endif()
 
-if( NOT BUILD_WITH_QT6 )
-    find_package(Qt5 COMPONENTS Core REQUIRED)
+if(BUILD_WITH_QT5)
+    set(QT_MAJOR_VERSION 5)
+    set(CMAKE_CXX_STANDARD 11)
+else()
+    set(QT_MAJOR_VERSION 6)
+    set(CMAKE_CXX_STANDARD 17)
 endif()
 
-if (Qt5Core_FOUND AND NOT BUILD_WITH_QT6)
-  set(QTKEYCHAIN_VERSION_INFIX 5)
+find_package(Qt${QT_MAJOR_VERSION} COMPONENTS Core REQUIRED)
+set(QTKEYCHAIN_VERSION_INFIX ${QT_MAJOR_VERSION})
 
+if (QT_MAJOR_VERSION EQUAL 5)
   if(ANDROID)
     if(Qt5Core_VERSION VERSION_LESS 5.7)
         find_package(Qt5 COMPONENTS Core REQUIRED Private)
@@ -100,10 +99,6 @@ if (Qt5Core_FOUND AND NOT BUILD_WITH_QT6)
   set(QTCORE_LIBRARIES ${Qt5Core_LIBRARIES})
   include_directories(${Qt5Core_INCLUDE_DIRS})
 else()
-  find_package(Qt6 COMPONENTS Core REQUIRED)
-  set(QTKEYCHAIN_VERSION_INFIX 6)
-
-
   if(UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAIKU AND NOT EMSCRIPTEN)
     find_package(Qt6 COMPONENTS DBus REQUIRED)
     set(QTDBUS_LIBRARIES Qt6::DBus)
@@ -191,13 +186,8 @@ if(BUILD_TEST_APPLICATION)
     if(APPLE)
         list(APPEND testclient_LIBRARIES "-framework Cocoa")
 
-        if (BUILD_WITH_QT6)
-            find_package(Qt6 COMPONENTS Gui REQUIRED)
-            list(APPEND testclient_LIBRARIES Qt6::Gui)
-        else()
-            find_package(Qt5 COMPONENTS Gui REQUIRED)
-            list(APPEND testclient_LIBRARIES Qt5::Gui)
-        endif()
+        find_package(Qt${QT_MAJOR_VERSION} COMPONENTS Gui REQUIRED)
+        list(APPEND testclient_LIBRARIES Qt${QT_MAJOR_VERSION}::Gui)
 
     endif()
     add_executable( testclient testclient.cpp )

TestAppExample/CMakeLists.txt

@@ -14,11 +14,11 @@ set(CMAKE_AUTOUIC ON)
 
 set(BUNDLE_IDENTIFIER "org.qtkeychain.TestAppExample")
 
-option(BUILD_WITH_QT6 "Build qtkeychain with Qt 6" OFF)
-if (BUILD_WITH_QT6)
-	set(QTx Qt6)
-else()
+option(BUILD_WITH_QT5 "Build qtkeychain with Qt 5 (default is Qt 6)" OFF)
+if (BUILD_WITH_QT5)
 	set(QTx Qt5)
+else()
+	set(QTx Qt6)
 endif()
 
 if(DEFINED QTKEYCHAIN_TARGET_NAME)
@@ -30,10 +30,10 @@ else()
 	if(EXISTS "${_qtkeychain_source_dir}/qtkeychain/keychain.h")
 		add_subdirectory("${_qtkeychain_source_dir}" "${CMAKE_CURRENT_BINARY_DIR}/qtkeychain_build")
 		# QTKEYCHAIN_TARGET_NAME is set inside the subdirectory scope, derive it here
-		if(BUILD_WITH_QT6)
-			set(KEYCHAIN_TARGET qt6keychain)
-		else()
+		if(BUILD_WITH_QT5)
 			set(KEYCHAIN_TARGET qt5keychain)
+		else()
+			set(KEYCHAIN_TARGET qt6keychain)
 		endif()
 	else()
 		# Fallback: find an already-installed QtKeychain
@@ -46,7 +46,7 @@ find_package(${QTx} COMPONENTS Core Network Quick Qml REQUIRED)
 
 qt_add_resources(QT_RESOURCES qml.qrc)
 
-if(BUILD_WITH_QT6)
+if(NOT BUILD_WITH_QT5)
 	qt_add_executable(TestAppExample
 		MANUAL_FINALIZATION
 		keychainclass.h
@@ -72,7 +72,7 @@ set_target_properties(TestAppExample PROPERTIES
 
 target_link_libraries(TestAppExample PRIVATE ${QTx}::Core ${QTx}::Network ${QTx}::Quick ${QTx}::Qml ${KEYCHAIN_TARGET})
 
-if(BUILD_WITH_QT6)
+if(NOT BUILD_WITH_QT5)
 	qt_import_qml_plugins(TestAppExample)
 	qt_finalize_target(TestAppExample)
 endif()

autotest/CMakeLists.txt

@@ -1,10 +1,6 @@
 include(ECMAddTests)
 
-if (BUILD_WITH_QT6)
-    find_package(Qt6 CONFIG COMPONENTS Core Test REQUIRED)
-else()
-    find_package(Qt5 CONFIG COMPONENTS Core Test REQUIRED)
-endif()
+find_package(Qt${QT_MAJOR_VERSION} CONFIG COMPONENTS Core Test REQUIRED)
 
 ecm_add_tests(basic.cpp LINK_LIBRARIES ${QTKEYCHAIN_TARGET_NAME} Qt${QT_MAJOR_VERSION}::Test)
 set_property(TARGET basic PROPERTY AUTOMOC ON)

cmake/Modules/QtVersionOption.cmake

@@ -26,11 +26,11 @@ if (TARGET Qt5::Core)
 elseif (TARGET Qt6::Core)
     set(QT_MAJOR_VERSION 6)
 else()
-    option(BUILD_WITH_QT6 "Build against Qt 6" OFF)
+    option(BUILD_WITH_QT5 "Build against Qt 5 (default is Qt 6)" OFF)
 
-    if (BUILD_WITH_QT6)
-        set(QT_MAJOR_VERSION 6)
-    else()
+    if (BUILD_WITH_QT5)
         set(QT_MAJOR_VERSION 5)
+    else()
+        set(QT_MAJOR_VERSION 6)
     endif()
 endif()