From f580a47a722135728fd0b435789e8e3555efb8fc Mon Sep 17 00:00:00 2001 From: EndrII Date: Sun, 27 Dec 2020 15:43:13 +0300 Subject: [PATCH] added Qt6 support --- Examples/CMakeLists.txt | 3 ++- ViewSolutions/CMakeLists.txt | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt index 4f4258e..7aa07c0 100644 --- a/Examples/CMakeLists.txt +++ b/Examples/CMakeLists.txt @@ -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" diff --git a/ViewSolutions/CMakeLists.txt b/ViewSolutions/CMakeLists.txt index 89757d8..7a31e9a 100644 --- a/ViewSolutions/CMakeLists.txt +++ b/ViewSolutions/CMakeLists.txt @@ -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")