Commit 137212b639281a48cf61b10d4d9fab9d5d7e4e8e
1 parent
48de2ae5
Qt6 / c++17 changes.
Showing
2 changed files
with
5 additions
and
3 deletions
CMakeLists.txt
@@ -15,6 +15,8 @@ if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/osdev_versioning/cmake) | @@ -15,6 +15,8 @@ if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/osdev_versioning/cmake) | ||
15 | include(osdevversion) | 15 | include(osdevversion) |
16 | endif() | 16 | endif() |
17 | 17 | ||
18 | +set(CMAKE_CXX_STANDARD 17) | ||
19 | + | ||
18 | include(projectheader) | 20 | include(projectheader) |
19 | project_header(osdev_jobscheduler) | 21 | project_header(osdev_jobscheduler) |
20 | 22 |
src/CMakeLists.txt
@@ -3,11 +3,11 @@ LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../external/hsoa | @@ -3,11 +3,11 @@ LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../external/hsoa | ||
3 | include(projectheader) | 3 | include(projectheader) |
4 | project_header(jobscheduler) | 4 | project_header(jobscheduler) |
5 | 5 | ||
6 | -find_package( Qt5Core REQUIRED ) | ||
7 | -find_package( Qt5Sql REQUIRED ) | 6 | +find_package( Qt6Core REQUIRED ) |
7 | +find_package( Qt6Sql REQUIRED ) | ||
8 | 8 | ||
9 | include_directories( SYSTEM | 9 | include_directories( SYSTEM |
10 | - ${Qt5Core_INCLUDE_DIRS} | 10 | + ${Qt6Core_INCLUDE_DIRS} |
11 | ) | 11 | ) |
12 | 12 | ||
13 | include(compiler) | 13 | include(compiler) |