added Qt6 support

This commit is contained in:
Andrei Yankovich 2020-12-27 15:43:13 +03:00
parent 8a9f1eff30
commit f580a47a72
2 changed files with 5 additions and 3 deletions

View File

@ -17,7 +17,8 @@ set(CMAKE_AUTORCC ON)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
find_package(Qt5 COMPONENTS Core REQUIRED)
find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED)
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core REQUIRED)
file(GLOB SOURCE_CPP
"src/*.cpp"

View File

@ -24,7 +24,8 @@ set(CMAKE_AUTORCC ON)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
find_package(Qt5 COMPONENTS Core Quick QuickControls2 REQUIRED)
find_package(QT NAMES Qt6 Qt5 COMPONENTS Core Quick QuickControls2 REQUIRED)
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Quick QuickControls2 REQUIRED)
file(GLOB SOURCE_CPP
"src/*.cpp"
@ -33,7 +34,7 @@ file(GLOB SOURCE_CPP
)
add_library(${PROJECT_NAME} ${SOURCE_CPP})
target_link_libraries(${PROJECT_NAME} PUBLIC Qt5::Core Qt5::Quick Qt5::QuickControls2)
target_link_libraries(${PROJECT_NAME} PUBLIC Qt::Core Qt::Quick Qt::QuickControls2)
target_include_directories(${PROJECT_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/src")