From 8fe37b0f3a6d20d6a19faff6d4b7de7f344fab14 Mon Sep 17 00:00:00 2001 From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Date: Sun, 21 Apr 2024 17:23:25 +0100 Subject: [PATCH] fixup! cmake: Add `libqrencode` optional package support --- cmake/optional.cmake | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cmake/optional.cmake b/cmake/optional.cmake index f2a0c24f484bb..ce134da2f1670 100644 --- a/cmake/optional.cmake +++ b/cmake/optional.cmake @@ -189,12 +189,13 @@ else() endif() if(WITH_GUI AND WITH_QRENCODE) - if(MSVC) + if(VCPKG_TARGET_TRIPLET) # TODO: vcpkg fails to build libqrencode package due to # the build error in its libiconv dependency. # See: https://github.com/microsoft/vcpkg/issues/36924. else() - cross_pkg_check_modules(libqrencode libqrencode IMPORTED_TARGET) + include(CrossPkgConfig) + cross_pkg_check_modules(libqrencode IMPORTED_TARGET libqrencode) endif() if(TARGET PkgConfig::libqrencode) set_target_properties(PkgConfig::libqrencode PROPERTIES