From d24908f7c876c950d1e115dcd25f9b46bc2ec94a Mon Sep 17 00:00:00 2001 From: EndrII Date: Thu, 1 Apr 2021 13:04:01 +0300 Subject: [PATCH] update cmake --- CMake | 2 +- CMakeLists.txt | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/CMake b/CMake index 30b2e07..1d440b9 160000 --- a/CMake +++ b/CMake @@ -1 +1 @@ -Subproject commit 30b2e07c474ab032dd120475b0a2a4cca6012fe7 +Subproject commit 1d440b95aa9fa67379199573ccf18c5c61cedb68 diff --git a/CMakeLists.txt b/CMakeLists.txt index 915d12f..15267bb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,6 +27,7 @@ include(CMake/ProjectOut.cmake) include(CMake/ccache.cmake) include(CMake/Version.cmake) include(CMake/QuasarAppCITargets.cmake) +include(CMake/QtFunctions.cmake) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOMOC ON) @@ -34,10 +35,7 @@ set(CMAKE_AUTORCC ON) set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) -if (NOT QT_VERSION_MAJOR) - find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED) - find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core REQUIRED) -endif () +includeQt(Core) file(GLOB SOURCE_CPP "*.cpp"