diff options
Diffstat (limited to '')
| -rw-r--r-- | src/CMakeLists.txt | 19 | ||||
| -rw-r--r-- | src/core/CMakeLists.txt | 1 |
2 files changed, 15 insertions, 5 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e47e2bae..8fa51056 100644 --- 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) @@ -279,9 +279,20 @@ if (BUILD_APPLICATION) file(GLOB _libDllPath "${_libDllBinPath}/libxml2-*.dll") list(APPEND ALL_RUNTIME_DEP_PATH_LIST ${_libDllPath}) + # /mingw64/libexec + execute_process( + COMMAND cygpath -m /mingw64/libexec + OUTPUT_VARIABLE MSYS64_LIBEXEC_PATH + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + # gpgme-w32spawn.exe unset(_libExEPath) - file(GLOB _libExEPath "${_libDllBinPath}/gpgme-w32spawn.exe") + file(GLOB _libExEPath "${MSYS64_LIBEXEC_PATH}/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 index bf64d15a..cc1f6742 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -82,7 +82,6 @@ if(MINGW) ) endif() - # configure libarchive if(NOT MINGW) if(APPLE) |