From 9bf6ed9d1d3373d3bc38fac46b97ea60644113e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E5=AD=90=E6=A5=9A=5Czhuzi?= Date: Thu, 17 Aug 2023 19:51:36 +0800 Subject: [PATCH] update --- CMakeLists.txt | 8 +++++++- src/CMakeLists.txt | 2 -- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 58d1e4b5..6841fc13 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,10 +11,16 @@ option(FLUENTUI_BUILD_EXAMPLES "Build FluentUI demo applications." ON) option(FLUENTUI_BUILD_FRAMELESSHEPLER "Build FramelessHelper." ON) option(FLUENTUI_BUILD_STATIC_LIB "Build static library." OFF) +find_package(Qt6 REQUIRED COMPONENTS Core Quick Qml) +set(QT_SDK_DIR "${Qt6_DIR}") +cmake_path(GET QT_SDK_DIR PARENT_PATH QT_SDK_DIR) +cmake_path(GET QT_SDK_DIR PARENT_PATH QT_SDK_DIR) +cmake_path(GET QT_SDK_DIR PARENT_PATH QT_SDK_DIR) + #设置QML插件输出目录，可以通过外部设置，如果外部没有设置就默认到\qml\FluentUI目录下 set(FLUENTUI_QML_PLUGIN_DIRECTORY "" CACHE PATH "Path to FluentUI plugin") if(NOT FLUENTUI_QML_PLUGIN_DIRECTORY) - set(FLUENTUI_QML_PLUGIN_DIRECTORY ${CMAKE_PREFIX_PATH}/qml/FluentUI) + set(FLUENTUI_QML_PLUGIN_DIRECTORY ${QT_SDK_DIR}/qml/FluentUI) endif() add_subdirectory(src) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e016d464..5934f54f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -11,8 +11,6 @@ if(APPLE) set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "" FORCE) endif() -find_package(Qt6 REQUIRED COMPONENTS Core Quick Qml) - if(QT_VERSION VERSION_GREATER_EQUAL "6.3") qt_standard_project_setup() else()