diff options
| -rw-r--r-- | .github/workflows/release.yml | 1 | ||||
| -rw-r--r-- | src/core/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/test/CMakeLists.txt | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f06ef971..9db3b204 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -99,6 +99,7 @@ jobs: pacman --noconfirm -S --needed make texinfo automake pacman --noconfirm -S --needed mingw-w64-x86_64-qt6 mingw-w64-x86_64-icu libintl msys2-runtime-devel gettext-devel pacman --noconfirm -S --needed mingw-w64-x86_64-ninja mingw-w64-x86_64-gnupg mingw-w64-x86_64-libarchive + pacman --noconfirm -S --needed mingw-w64-x86_64-gtest if: matrix.os == 'windows-2019' - name: Build gpg-error (Linux) diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 8993c230..efd43e3f 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -54,7 +54,8 @@ target_compile_definitions(gpgfrontend_core PUBLIC GF_CORE) if(NOT APPLE) target_link_libraries(gpgfrontend_core PUBLIC mimalloc) - if(MINGW) + # use system installed libraries or install it system wide + if(MINGW AND NOT STABLE_BUILD_FULL_SDK) set_target_properties(mimalloc PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt index f052e7e2..79f17ac0 100644 --- a/src/test/CMakeLists.txt +++ b/src/test/CMakeLists.txt @@ -53,7 +53,8 @@ if(XCODE_BUILD) XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "${GPGFRONTEND_XOCDE_CODE_SIGN_IDENTITY}") endif() -if(MINGW) +# use system installed libraries or install it system wide +if(MINGW AND NOT STABLE_BUILD_FULL_SDK) set_target_properties(gtest PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" |