From 0c59a233eab53bed3fb421a523c07afcde311370 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E5=AD=90=E6=A5=9A=5Czhuzi?= Date: Tue, 4 Apr 2023 03:15:10 +0800 Subject: [PATCH] update --- CMakeLists.txt | 1 + example/example.pro | 4 ++-- src/build_windows.pri | 14 +++----------- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e9c7deae..038a2bf7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,5 @@ cmake_minimum_required(VERSION 3.16) project(FluentUI VERSION 0.1 LANGUAGES CXX) + add_subdirectory(src) add_subdirectory(example) diff --git a/example/example.pro b/example/example.pro index be84c3f3..733943f7 100644 --- a/example/example.pro +++ b/example/example.pro @@ -25,10 +25,10 @@ CONFIG(debug,debug|release) { win32 { contains(QT_ARCH, i386) { COPYDLL = $$absolute_path($${_PRO_FILE_PWD_}/../third/Win_x86/*.dll) $$DESTDIR - QMAKE_PRE_LINK += $$QMAKE_COPY $$replace(COPYDLL, /, \\) + QMAKE_PRE_LINK += $$QMAKE_COPY $$replace(COPYDLL, /, $$QMAKE_DIR_SEP) } else { COPYDLL = $$absolute_path($${_PRO_FILE_PWD_}/../third/Win_x64/*.dll) $$DESTDIR - QMAKE_PRE_LINK += $$QMAKE_COPY $$replace(COPYDLL, /, \\) + QMAKE_PRE_LINK += $$QMAKE_COPY $$replace(COPYDLL, /, $$QMAKE_DIR_SEP) } } diff --git a/src/build_windows.pri b/src/build_windows.pri index c8bc7dbc..9b107502 100644 --- a/src/build_windows.pri +++ b/src/build_windows.pri @@ -1,28 +1,20 @@ OUTP = $$OUT_PWD/../bin/FluentUI BUILDBIN_PATH = $$replace(OUTP, src/../bin, bin) -message("----------------->") -message($$OUTP) -message($$BUILDBIN_PATH) QTQMLFLUENT_PATH = $$[QT_INSTALL_QML]/FluentUI PRESET_PATH = $$PWD/build-preset SOLIBFILE_PATH = $$OUT_PWD/libFluentUI.so ANDROID = NO - android{ ANDROID=YES - QMAKE_PRE_LINK *= md $$replace(OUTP, /, \\) + QMAKE_PRE_LINK *= md $$replace(OUTP, /, $$QMAKE_DIR_SEP) }else{ DESTDIR += $$OUTP } - SHAREDSCRIPT = "$$PWD\win_install.bat" SHARED "$$PWD" "$$PRESET_PATH" "$$BUILDBIN_PATH" "$$QTQMLFLUENT_PATH" $$ANDROID "$$SOLIBFILE_PATH" STATICSCRIPT = "$$PWD\win_install.bat" STATIC "$$PWD" "$$PRESET_PATH" "$$BUILDBIN_PATH" "$$QTQMLFLUENT_PATH" $$ANDROID "$$SOLIBFILE_PATH" - -message("-------------------------") -message($$SHAREDSCRIPT) CONFIG(sharedlib){ - QMAKE_POST_LINK *= $$replace(SHAREDSCRIPT, /, \\) + QMAKE_POST_LINK *= $$replace(SHAREDSCRIPT, /, $$QMAKE_DIR_SEP) } else{ - QMAKE_POST_LINK *= $$replace(STATICSCRIPT, /, \\) + QMAKE_POST_LINK *= $$replace(STATICSCRIPT, /, $$QMAKE_DIR_SEP) }