diff --git a/.github/workflows/windows_qt5.yml b/.github/workflows/windows_qt5.yml index 69ca4a30..b2d1f99e 100644 --- a/.github/workflows/windows_qt5.yml +++ b/.github/workflows/windows_qt5.yml @@ -24,9 +24,9 @@ jobs: os: [windows-2019] include: - qt_ver: 5.15.2 - qt_arch: win64_msvc2019_64 - msvc_arch: x64 - qt_arch_install: msvc2019_64 + qt_arch: win32_msvc2019 + msvc_arch: x86 + qt_arch_install: msvc2019 env: targetName: example.exe fileName: example @@ -50,7 +50,7 @@ jobs: call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" ${{ matrix.msvc_arch }} mkdir build cd build - cmake -DCMAKE_MESSAGE_LOG_LEVEL=STATUS -DCMAKE_PREFIX_PATH=D:\a\FluentUI\Qt\5.15.2\msvc2019_64 -DCMAKE_C_COMPILER=cl -DCMAKE_CXX_COMPILER=cl -DCMAKE_BUILD_TYPE=Release -GNinja .. + cmake -DCMAKE_MESSAGE_LOG_LEVEL=STATUS -DCMAKE_PREFIX_PATH=D:\a\FluentUI\Qt\5.15.2\msvc2019 -DCMAKE_C_COMPILER=cl -DCMAKE_CXX_COMPILER=cl -DCMAKE_BUILD_TYPE=Release -GNinja .. cmake --build . --target all --config Release --parallel echo winSdkDir=%WindowsSdkDir% >> %GITHUB_ENV% echo winSdkVer=%WindowsSdkVersion% >> %GITHUB_ENV% diff --git a/3rdparty/mingw/libcrypto-1_1-x64.dll b/3rdparty/Win_x64/mingw/libcrypto-1_1-x64.dll similarity index 100% rename from 3rdparty/mingw/libcrypto-1_1-x64.dll rename to 3rdparty/Win_x64/mingw/libcrypto-1_1-x64.dll diff --git a/3rdparty/mingw/libgcc_s_seh-1.dll b/3rdparty/Win_x64/mingw/libgcc_s_seh-1.dll similarity index 100% rename from 3rdparty/mingw/libgcc_s_seh-1.dll rename to 3rdparty/Win_x64/mingw/libgcc_s_seh-1.dll diff --git a/3rdparty/mingw/libssl-1_1-x64.dll b/3rdparty/Win_x64/mingw/libssl-1_1-x64.dll similarity index 100% rename from 3rdparty/mingw/libssl-1_1-x64.dll rename to 3rdparty/Win_x64/mingw/libssl-1_1-x64.dll diff --git a/3rdparty/mingw/libstdc++-6.dll b/3rdparty/Win_x64/mingw/libstdc++-6.dll similarity index 100% rename from 3rdparty/mingw/libstdc++-6.dll rename to 3rdparty/Win_x64/mingw/libstdc++-6.dll diff --git a/3rdparty/mingw/libwinpthread-1.dll b/3rdparty/Win_x64/mingw/libwinpthread-1.dll similarity index 100% rename from 3rdparty/mingw/libwinpthread-1.dll rename to 3rdparty/Win_x64/mingw/libwinpthread-1.dll diff --git a/3rdparty/msvc/libcrypto-1_1-x64.dll b/3rdparty/Win_x64/msvc/libcrypto-1_1-x64.dll similarity index 100% rename from 3rdparty/msvc/libcrypto-1_1-x64.dll rename to 3rdparty/Win_x64/msvc/libcrypto-1_1-x64.dll diff --git a/3rdparty/msvc/libssl-1_1-x64.dll b/3rdparty/Win_x64/msvc/libssl-1_1-x64.dll similarity index 100% rename from 3rdparty/msvc/libssl-1_1-x64.dll rename to 3rdparty/Win_x64/msvc/libssl-1_1-x64.dll diff --git a/3rdparty/Win_x86/mingw/libcrypto-1_1.dll b/3rdparty/Win_x86/mingw/libcrypto-1_1.dll new file mode 100644 index 00000000..e69f7f40 Binary files /dev/null and b/3rdparty/Win_x86/mingw/libcrypto-1_1.dll differ diff --git a/3rdparty/Win_x86/mingw/libssl-1_1.dll b/3rdparty/Win_x86/mingw/libssl-1_1.dll new file mode 100644 index 00000000..edea6240 Binary files /dev/null and b/3rdparty/Win_x86/mingw/libssl-1_1.dll differ diff --git a/3rdparty/Win_x86/msvc/libcrypto-1_1.dll b/3rdparty/Win_x86/msvc/libcrypto-1_1.dll new file mode 100644 index 00000000..e69f7f40 Binary files /dev/null and b/3rdparty/Win_x86/msvc/libcrypto-1_1.dll differ diff --git a/3rdparty/Win_x86/msvc/libssl-1_1.dll b/3rdparty/Win_x86/msvc/libssl-1_1.dll new file mode 100644 index 00000000..edea6240 Binary files /dev/null and b/3rdparty/Win_x86/msvc/libssl-1_1.dll differ diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt index 11aec7e4..72512675 100644 --- a/example/CMakeLists.txt +++ b/example/CMakeLists.txt @@ -53,7 +53,7 @@ endforeach(filepath) if(QT_VERSION VERSION_GREATER_EQUAL "6.2") #遍历所有qml文件 - file(GLOB_RECURSE QML_PATHS *.qml qmldir) + file(GLOB_RECURSE QML_PATHS *.qml) foreach(filepath ${QML_PATHS}) string(REPLACE "${CMAKE_CURRENT_SOURCE_DIR}/" "" filename ${filepath}) if(${filepath} MATCHES "Qt${QT_VERSION_MAJOR}/") @@ -64,7 +64,7 @@ if(QT_VERSION VERSION_GREATER_EQUAL "6.2") endforeach(filepath) #遍历所有资源文件 - file(GLOB_RECURSE RES_PATHS *.png *.jpg *.svg *.ico *.ttf *.webp) + file(GLOB_RECURSE RES_PATHS *.png *.jpg *.svg *.ico *.ttf *.webp qmldir) foreach(filepath ${RES_PATHS}) string(REPLACE "${CMAKE_CURRENT_SOURCE_DIR}/" "" filename ${filepath}) list(APPEND resource_files ${filename}) @@ -93,12 +93,17 @@ else () ) endif () -#复制动态库到可执行文件同级目录下 if(WIN32) + #复制动态库到可执行文件同级目录下 + if(CMAKE_SIZEOF_VOID_P EQUAL 4) + set(3RDPARTY_ARCH_DIR ${CMAKE_SOURCE_DIR}/3rdparty/Win_x86) + elseif(CMAKE_SIZEOF_VOID_P EQUAL 8) + set(3RDPARTY_ARCH_DIR ${CMAKE_SOURCE_DIR}/3rdparty/Win_x64) + endif() if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") - set(DLLPATH ${CMAKE_SOURCE_DIR}/3rdparty/msvc/*.dll) + set(DLLPATH ${3RDPARTY_ARCH_DIR}/msvc/*.dll) else() - set(DLLPATH ${CMAKE_SOURCE_DIR}/3rdparty/mingw/*.dll) + set(DLLPATH ${3RDPARTY_ARCH_DIR}/mingw/*.dll) endif() string(REPLACE "/" ${PATH_SEPARATOR} DLLPATH "${DLLPATH}") file(GLOB DLL_FILES ${DLLPATH})