From d8ed4190a5b9e9f33f767209485ce3ff2bfce309 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E5=AD=90=E6=A5=9A=5Czhuzi?= Date: Sat, 15 Jul 2023 00:20:33 +0800 Subject: [PATCH] update --- CMakeLists.txt | 7 +++++++ src/CMakeLists.txt | 10 ++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2e9eabf4..7d4822d5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,6 +8,12 @@ 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) +#设置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) +endif() + add_subdirectory(src) if (FLUENTUI_BUILD_EXAMPLES) @@ -24,3 +30,4 @@ message("------------------------ FluentUI ------------------------") message("Build FluentUI demo applications.: ${FLUENTUI_BUILD_EXAMPLES}") message("Build FramelessHelper.: ${FLUENTUI_BUILD_FRAMELESSHEPLER}") message("Build static library.: ${FLUENTUI_BUILD_STATIC_LIB}") +message("Path to FluentUI plugin.: ${FLUENTUI_QML_PLUGIN_DIRECTORY}") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 7c191db4..de3beb29 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -3,12 +3,6 @@ set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) project(fluentuiplugin LANGUAGES CXX) -#设置QML插件输出目录,可以通过外部设置,如果外部没有设置就默认到\qml\FluentUI目录下 -set(QML_PLUGIN_DIRECTORY "" CACHE PATH "Path to FluentUI plugin") -if(NOT QML_PLUGIN_DIRECTORY) - set(QML_PLUGIN_DIRECTORY ${CMAKE_PREFIX_PATH}/qml/FluentUI) -endif() - #设置版本号 add_definitions(-DVERSION=1,3,7,4) @@ -59,7 +53,7 @@ add_qmlplugin(fluentuiplugin SOURCES ${sources_files} fluentui.rc fluentui.qrc QMLFILES ${qml_files} QMLDIR imports/FluentUI - BINARY_DIR ${QML_PLUGIN_DIRECTORY} + BINARY_DIR ${FLUENTUI_QML_PLUGIN_DIRECTORY} LIBTYPE ${LIB_TYPE} ) @@ -75,4 +69,4 @@ target_link_libraries(fluentuiplugin PUBLIC ) #安装 -install(DIRECTORY ${QML_PLUGIN_DIRECTORY} DESTINATION ${CMAKE_INSTALL_PREFIX}/imports) +install(DIRECTORY ${FLUENTUI_QML_PLUGIN_DIRECTORY} DESTINATION ${CMAKE_INSTALL_PREFIX}/imports)