From 137212b639281a48cf61b10d4d9fab9d5d7e4e8e Mon Sep 17 00:00:00 2001 From: Steven de Ridder Date: Thu, 27 Jan 2022 11:29:37 +0100 Subject: [PATCH] Qt6 / c++17 changes. --- CMakeLists.txt | 2 ++ src/CMakeLists.txt | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6dcf2b2..5989125 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,6 +15,8 @@ if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/osdev_versioning/cmake) include(osdevversion) endif() +set(CMAKE_CXX_STANDARD 17) + include(projectheader) project_header(osdev_jobscheduler) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6a654ed..3beb56a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -3,11 +3,11 @@ LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../external/hsoa include(projectheader) project_header(jobscheduler) -find_package( Qt5Core REQUIRED ) -find_package( Qt5Sql REQUIRED ) +find_package( Qt6Core REQUIRED ) +find_package( Qt6Sql REQUIRED ) include_directories( SYSTEM - ${Qt5Core_INCLUDE_DIRS} + ${Qt6Core_INCLUDE_DIRS} ) include(compiler) -- libgit2 0.21.4