fix: slove ci issues

saturneric · Feb 1, 2024 · 3e55c50 · 3e55c50
1 parent 23b3059
commit 3e55c50
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -152,7 +152,7 @@ jobs:
           git clone --depth 1 --branch gpgme-1.22.0 git://git.gnupg.org/gpgme.git ${{github.workspace}}/third_party/gpgme
           cd ${{github.workspace}}/third_party/gpgme
           ./autogen.sh
-          ./configure --enable-maintainer-mode --enable-languages=cpp --disable-gpg-test && make -j4
+          ./configure --enable-maintainer-mode --enable-languages=cpp && make -j4
           sudo make install
           cd ${{github.workspace}}
         if: matrix.os == 'ubuntu-20.04'
@@ -163,7 +163,7 @@ jobs:
           git clone --depth 1 --branch gpgme-1.22.0 git://git.gnupg.org/gpgme.git ${{github.workspace}}/third_party/gpgme
           cd ${{github.workspace}}/third_party/gpgme
           ./autogen.sh
-          ./configure --enable-maintainer-mode --enable-languages=cpp && make -j4
+          ./configure --enable-maintainer-mode --enable-languages=cpp --disable-gpg-test && make -j4
           make install
           cd ${{github.workspace}}
         if: matrix.os == 'windows-2019'

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -179,7 +179,7 @@ if (BUILD_APPLICATION)
         list(APPEND ALL_RUNTIME_DEP_PATH_LIST ${_libDllPath})
 
         unset(_libDllPath)
-        file(GLOB _libDllPath "${_libDllBinPath}/libassuan-*.dll")
+        file(GLOB _libDllPath "${_libDllBinPath}/libassuan*.dll")
         list(APPEND ALL_RUNTIME_DEP_PATH_LIST ${_libDllPath})
 
         unset(_libDllPath)
@@ -207,11 +207,11 @@ if (BUILD_APPLICATION)
         list(APPEND ALL_RUNTIME_DEP_PATH_LIST ${_libDllPath})
 
         unset(_libDllPath)
-        file(GLOB _libDllPath "${_libDllBinPath}/libgpg-error-*.dll")
+        file(GLOB _libDllPath "${_libDllBinPath}/libgpg-error*.dll")
         list(APPEND ALL_RUNTIME_DEP_PATH_LIST ${_libDllPath})
 
         unset(_libDllPath)
-        file(GLOB _libDllPath "${_libDllBinPath}/libgpgme-*.dll")
+        file(GLOB _libDllPath "${_libDllBinPath}/libgpgme*.dll")
         list(APPEND ALL_RUNTIME_DEP_PATH_LIST ${_libDllPath})
 
         unset(_libDllPath)
@@ -281,7 +281,11 @@ if (BUILD_APPLICATION)
 
         # gpgme-w32spawn.exe
         unset(_libExEPath)
-        file(GLOB _libExEPath "${_libDllBinPath}/gpgme-w32spawn.exe")
+        file(GLOB _libExEPath "/mingw64/libexec/gpgme-*.exe")
+        list(APPEND ALL_RUNTIME_DEP_PATH_LIST ${_libExEPath})
+
+        unset(_libExEPath)
+        file(GLOB _libExEPath "${_libDllBinPath}/gpgme-*.exe")
         list(APPEND ALL_RUNTIME_DEP_PATH_LIST ${_libExEPath})
 
         set(ALL_RUNTIME_DLL_FILES "")

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -82,7 +82,6 @@ if(MINGW)
     )
 endif()
 
-
 # configure libarchive
 if(NOT MINGW)
     if(APPLE)