From d6fa6a163e617879765dced9b3d6f97ba0169a09 Mon Sep 17 00:00:00 2001 From: Yuhang Zhao <2546789017@qq.com> Date: Sat, 30 Apr 2022 13:30:30 +0800 Subject: [PATCH] quick: fix build on Qt5 Signed-off-by: Yuhang Zhao <2546789017@qq.com> --- src/quick/CMakeLists.txt | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/quick/CMakeLists.txt b/src/quick/CMakeLists.txt index bfbdd97..3ad8bce 100644 --- a/src/quick/CMakeLists.txt +++ b/src/quick/CMakeLists.txt @@ -22,10 +22,8 @@ SOFTWARE. ]] -if(${QT_VERSION_MAJOR} GREATER_EQUAL 6) - find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS QuickTemplates2) - find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS QuickTemplates2) -endif() +find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Qml QuickTemplates2 QuickControls2) +find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Qml QuickTemplates2 QuickControls2) set(SUB_PROJ_NAME FramelessHelperQuick) @@ -102,15 +100,12 @@ else() endif() target_link_libraries(${SUB_PROJ_NAME} PRIVATE + Qt${QT_VERSION_MAJOR}::QmlPrivate Qt${QT_VERSION_MAJOR}::QuickPrivate + Qt${QT_VERSION_MAJOR}::QuickTemplates2Private + Qt${QT_VERSION_MAJOR}::QuickControls2Private ) -if(${QT_VERSION_MAJOR} GREATER_EQUAL 6) - target_link_libraries(${SUB_PROJ_NAME} PRIVATE - Qt${QT_VERSION_MAJOR}::QuickTemplates2Private - ) -endif() - target_link_libraries(${SUB_PROJ_NAME} PUBLIC FramelessHelperCore )