Compare commits

..

No commits in common. "e2ff752ed9499fa4562c7ba956982008ce25d02b" and "112bb6e07acf6e4f5811b7a12ffb050fc414958b" have entirely different histories.

3 changed files with 22 additions and 56 deletions

View File

@ -4,7 +4,6 @@ project(FluentUI VERSION 0.1 LANGUAGES CXX)
option(FLUENTUI_BUILD_EXAMPLES "Build FluentUI demo applications." ON) option(FLUENTUI_BUILD_EXAMPLES "Build FluentUI demo applications." ON)
option(FLUENTUI_BUILD_FRAMELESSHEPLER "Build FramelessHelper." ON) option(FLUENTUI_BUILD_FRAMELESSHEPLER "Build FramelessHelper." ON)
option(FLUENTUI_BUILD_STATIC_LIB "Build static library." OFF)
add_subdirectory(src) add_subdirectory(src)
@ -21,4 +20,3 @@ endif ()
message("------------------------ FluentUI ------------------------") message("------------------------ FluentUI ------------------------")
message("Build FluentUI demo applications.: ${FLUENTUI_BUILD_EXAMPLES}") message("Build FluentUI demo applications.: ${FLUENTUI_BUILD_EXAMPLES}")
message("Build FramelessHelper.: ${FLUENTUI_BUILD_FRAMELESSHEPLER}") message("Build FramelessHelper.: ${FLUENTUI_BUILD_FRAMELESSHEPLER}")
message("Build static library.: ${FLUENTUI_BUILD_STATIC_LIB}")

View File

@ -98,22 +98,12 @@ set_target_properties(example PROPERTIES
) )
# #
if (FLUENTUI_BUILD_STATIC_LIB) target_link_libraries(example PRIVATE
target_link_libraries(example PRIVATE Qt6::Quick
Qt6::Quick fluentuiplugin
fluentui FramelessHelper::Core
fluentuiplugin FramelessHelper::Quick
FramelessHelper::Core )
FramelessHelper::Quick
)
else()
target_link_libraries(example PRIVATE
Qt6::Quick
fluentuiplugin
FramelessHelper::Core
FramelessHelper::Quick
)
endif()
# #
install(TARGETS example install(TARGETS example

View File

@ -1,10 +1,7 @@
cmake_minimum_required(VERSION 3.20) cmake_minimum_required(VERSION 3.20)
if (FLUENTUI_BUILD_STATIC_LIB) project(fluentuiplugin LANGUAGES CXX)
project(fluentui LANGUAGES CXX)
else()
project(fluentuiplugin LANGUAGES CXX)
endif()
# #
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
if(APPLE) if(APPLE)
@ -55,41 +52,22 @@ foreach(filepath IN LISTS qml_files resource_files)
endforeach() endforeach()
#qml #qml
if (FLUENTUI_BUILD_STATIC_LIB) qt_add_library(fluentuiplugin SHARED)
set(LIB_TYPE "STATIC") qt_add_qml_module(fluentuiplugin
else() #fluentuiplugin.dllfluentuipluginplugin.dll
set(LIB_TYPE "SHARED") PLUGIN_TARGET fluentuiplugin
endif() OUTPUT_DIRECTORY ${QML_PLUGIN_DIRECTORY}
qt_add_library(${PROJECT_NAME} ${LIB_TYPE}) VERSION 1.0
if (FLUENTUI_BUILD_STATIC_LIB) URI "FluentUI"
qt_add_qml_module(${PROJECT_NAME} #qmltypesfluentuiplugin.qmltypes使import FluentUIplugins.qmltypes
#使PLUGIN_TARGET TYPEINFO "plugins.qmltypes"
OUTPUT_DIRECTORY ${QML_PLUGIN_DIRECTORY} SOURCES ${sources_files} fluentui.rc
VERSION 1.0 QML_FILES ${qml_files}
URI "FluentUI" RESOURCES ${resource_files}
#qmltypesfluentuiplugin.qmltypes使import FluentUIplugins.qmltypes )
TYPEINFO "plugins.qmltypes"
SOURCES ${sources_files} fluentui.rc
QML_FILES ${qml_files}
RESOURCES ${resource_files}
)
else()
qt_add_qml_module(${PROJECT_NAME}
#fluentuiplugin.dllfluentuipluginplugin.dll
PLUGIN_TARGET fluentuiplugin
OUTPUT_DIRECTORY ${QML_PLUGIN_DIRECTORY}
VERSION 1.0
URI "FluentUI"
#qmltypesfluentuiplugin.qmltypes使import FluentUIplugins.qmltypes
TYPEINFO "plugins.qmltypes"
SOURCES ${sources_files} fluentui.rc
QML_FILES ${qml_files}
RESOURCES ${resource_files}
)
endif()
# #
target_link_libraries(${PROJECT_NAME} PUBLIC target_link_libraries(fluentuiplugin PUBLIC
Qt::CorePrivate Qt::CorePrivate
Qt::QuickPrivate Qt::QuickPrivate
Qt::QmlPrivate Qt::QmlPrivate