diff options
| author | saturneric <[email protected]> | 2024-05-11 16:57:02 +0000 |
|---|---|---|
| committer | saturneric <[email protected]> | 2024-05-11 16:57:02 +0000 |
| commit | 952ed73f967c8868faa6000041ffde8462bdf932 (patch) | |
| tree | 428fe9e63ecae6bb93be6f20cd2b1ee9b29ffd8d | |
| parent | fix: add mingw-w64-x86_64-icu-73.2-1-any.pkg.tar.zst to solve uic.exe error (diff) | |
| download | GpgFrontend-952ed73f967c8868faa6000041ffde8462bdf932.tar.gz GpgFrontend-952ed73f967c8868faa6000041ffde8462bdf932.zip | |
fix: remove qt5compat and redirect dll output path of modules
| -rw-r--r-- | .github/workflows/codeql-analysis.yml | 3 | ||||
| -rw-r--r-- | .github/workflows/release-qt5.yml | 1 | ||||
| -rw-r--r-- | .github/workflows/release.yml | 2 | ||||
| -rw-r--r-- | src/module/mods/gpg_info/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/module/mods/ver_check/CMakeLists.txt | 3 |
5 files changed, 5 insertions, 7 deletions
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 01d540ec..f420374d 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -97,9 +97,8 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v3 with: - version: '6.6.1' + version: '6.5.3' cache: 'true' - modules: 'qt5compat' - name: Configure CMake && Build GpgFrontend run: | diff --git a/.github/workflows/release-qt5.yml b/.github/workflows/release-qt5.yml index ffd77cc6..f65408e8 100644 --- a/.github/workflows/release-qt5.yml +++ b/.github/workflows/release-qt5.yml @@ -146,7 +146,6 @@ jobs: cd $(echo "/${{github.workspace}}" | sed 's/\\/\//g' | sed 's/://') mkdir build && cd build cmake -G Ninja -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DGPGFRONTEND_BUILD_TYPE_STABLE=ON -DGPGFRONTEND_QT5_BUILD=ON .. - # Build your program with the given configuration cmake --build . --config ${{env.BUILD_TYPE}} -- -j 4 if: matrix.os == 'windows-2019' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 914fff52..611b0333 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -78,7 +78,6 @@ jobs: uses: jurplel/install-qt-action@v3 with: version: '6.5.3' - modules: 'qt5compat' cache: 'true' if: matrix.os == 'ubuntu-20.04' || matrix.os == 'macos-11' || matrix.os == 'macos-12' @@ -254,7 +253,6 @@ jobs: cd $(echo "/${{github.workspace}}" | sed 's/\\/\//g' | sed 's/://') mkdir build && cd build cmake -G Ninja -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DGPGFRONTEND_BUILD_TYPE_STABLE=ON .. - # Build your program with the given configuration cmake --build . --config ${{env.BUILD_TYPE}} -- -j 4 if: matrix.os == 'windows-2019' diff --git a/src/module/mods/gpg_info/CMakeLists.txt b/src/module/mods/gpg_info/CMakeLists.txt index 61c440a9..6660f5cb 100644 --- a/src/module/mods/gpg_info/CMakeLists.txt +++ b/src/module/mods/gpg_info/CMakeLists.txt @@ -39,7 +39,8 @@ target_include_directories(mod_gpg_info PRIVATE # set output directory set_target_properties(mod_gpg_info PROPERTIES - LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/mods) + LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/mods + RUNTIME_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/mods) if (XCODE_BUILD) set_target_properties(mod_gpg_info diff --git a/src/module/mods/ver_check/CMakeLists.txt b/src/module/mods/ver_check/CMakeLists.txt index 1aaf94cf..b07a499a 100644 --- a/src/module/mods/ver_check/CMakeLists.txt +++ b/src/module/mods/ver_check/CMakeLists.txt @@ -39,7 +39,8 @@ target_include_directories(mod_ver_check PRIVATE # set output directory set_target_properties(mod_ver_check PROPERTIES - LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/mods) + LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/mods + RUNTIME_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/mods) if (XCODE_BUILD) set_target_properties(mod_ver_check |