From 9d89328a43ca20d1b15ba128faed6f458bdba12b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E5=AD=90=E6=A5=9A=5Czhuzi?= Date: Mon, 3 Apr 2023 22:45:18 +0800 Subject: [PATCH] update --- example/CMakeLists.txt | 39 ++++++++++++++++++++++++++++++--------- src/CMakeLists.txt | 5 +++-- src/Fluent.cpp | 2 +- 3 files changed, 34 insertions(+), 12 deletions(-) diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt index 8b1bafc..f87c657 100644 --- a/example/CMakeLists.txt +++ b/example/CMakeLists.txt @@ -7,6 +7,18 @@ set(CMAKE_AUTOUIC ON) set(CMAKE_CXX_STANDARD 17) +if(CMAKE_SIZEOF_VOID_P EQUAL 8) + set(platform 64) +else() + set(platform 32) +endif() + +if(CMAKE_BUILD_TYPE STREQUAL "Debug") + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../bin/debug) +else() + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../bin/release) +endif() + find_package(Qt6 COMPONENTS Core Quick QuickControls2 Concurrent Network Multimedia REQUIRED) set(SOURCES @@ -28,17 +40,26 @@ set(RC_ICONS qt_add_resources(QT_RESOURCES ${RESOURCES}) -if(WIN32) - if(QT_ARCH EQUAL 32) - set(COPYDLL ${CMAKE_CURRENT_SOURCE_DIR}/../third/Win_x86/*.dll ${DESTDIR}) - else() - set(COPYDLL ${CMAKE_CURRENT_SOURCE_DIR}/../third/Win_x64/*.dll ${DESTDIR}) - endif() - set(QMAKE_PRE_LINK "${QMAKE_COPY} ${COPYDLL}") -endif() - add_executable(${PROJECT_NAME} ${SOURCES} ${HEADERS} ${QT_RESOURCES} ${RC_ICONS}) +if(WIN32) + if(platform EQUAL 32) + file(GLOB DLL_FILES ${CMAKE_CURRENT_SOURCE_DIR}/../third/Win_x86/*.dll) + add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy + ${DLL_FILES} + ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} + ) + else() + file(GLOB DLL_FILES ${CMAKE_CURRENT_SOURCE_DIR}/../third/Win_x64/*.dll) + add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy + ${DLL_FILES} + ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} + ) + endif() +endif() + target_compile_definitions(${PROJECT_NAME} PRIVATE QT_DEPRECATED_WARNINGS QT_NO_WARNING_OUTPUT diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9aa74a6..033168e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -45,12 +45,13 @@ else() set(TARGET_SOURCES ${TARGET_SOURCES} FramelessView_unix.cpp) endif() +add_definitions(-DVERSION_IN="1.0.0") +add_definitions(-DVURI_STR="FluentUI") + add_library(${PROJECT_NAME} ${TARGET_TYPE} ${TARGET_SOURCES} ${TARGET_HEADERS} ${TARGET_RESOURCES}) set_target_properties(${PROJECT_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/FluentUI) -target_compile_definitions(${PROJECT_NAME} PRIVATE VERSION_IN=\\\"1.0.0\\\" URI_STR=\\\"FluentUI\\\") - if(WIN32) target_link_libraries(${PROJECT_NAME} PRIVATE dwmapi user32) else() diff --git a/src/Fluent.cpp b/src/Fluent.cpp index 69fe42d..9abfab5 100644 --- a/src/Fluent.cpp +++ b/src/Fluent.cpp @@ -22,7 +22,7 @@ Fluent *Fluent::getInstance() QString Fluent::version() const { - return QStringLiteral("1.0.0"); + return QStringLiteral(VERSION_IN); } void Fluent::registerTypes(const char *uri){