Skip to content

chore: default to Qt6 and C++20 #1478

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
letsfindaway wants to merge 1 commit into
base: dev
Choose a base branch
from
+3 −3
Open

chore: default to Qt6 and C++20 #1478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ cmake_minimum_required(VERSION 3.16)
# Typically set to /usr or /opt
# QT_VERSION
# Qt Version to use
# Set to empty, 5 or 6, defaults to auto-selection with preference to 5
# Set to empty, 5 or 6, defaults to auto-selection with preference to 6
#
# Typical invocation
# cmake -S <srcdir> -B <builddir> -DCMAKE_INSTALL_PREFIX:PATH=/usr
Expand Down Expand Up @@ -81,7 +81,7 @@ set(OPENBOARD_MIMEICON_FILE resources/linux/ch.openboard.application-ubz.svg)
# Basic compiler settings
# ==========================================================================

set(CMAKE_CXX_STANDARD 17 CACHE STRING "C++ standard to use - defaults to C++17")
set(CMAKE_CXX_STANDARD 20 CACHE STRING "C++ standard to use - defaults to C++20")
set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTOUIC ON)
Expand Down
2 changes: 1 addition & 1 deletion cmake/DependencyQt.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ set(QT_COMPONENTS
)

if(QT_VERSION STREQUAL "")
find_package(QT NAMES Qt5 Qt6 REQUIRED COMPONENTS Core)
find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core)
set(QT_VERSION ${QT_VERSION_MAJOR})
endif()

Expand Down