From 9e5089dbb02ef8a32f484aab682ad06748e1a532 Mon Sep 17 00:00:00 2001 From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Date: Mon, 28 Oct 2024 14:09:12 +0000 Subject: [PATCH] build, msvc: Enable `libqrencode` vcpkg package --- CMakePresets.json | 6 ++---- doc/build-windows-msvc.md | 4 +--- vcpkg.json | 3 ++- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/CMakePresets.json b/CMakePresets.json index c9d2d1b31fe..597907b9324 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -15,8 +15,7 @@ "toolchainFile": "$env{VCPKG_ROOT}\\scripts\\buildsystems\\vcpkg.cmake", "cacheVariables": { "VCPKG_TARGET_TRIPLET": "x64-windows", - "BUILD_GUI": "ON", - "WITH_QRENCODE": "OFF" + "BUILD_GUI": "ON" } }, { @@ -32,8 +31,7 @@ "toolchainFile": "$env{VCPKG_ROOT}\\scripts\\buildsystems\\vcpkg.cmake", "cacheVariables": { "VCPKG_TARGET_TRIPLET": "x64-windows-static", - "BUILD_GUI": "ON", - "WITH_QRENCODE": "OFF" + "BUILD_GUI": "ON" } }, { diff --git a/doc/build-windows-msvc.md b/doc/build-windows-msvc.md index 80c2b77f1e8..482b7a7d1fb 100644 --- a/doc/build-windows-msvc.md +++ b/doc/build-windows-msvc.md @@ -42,9 +42,7 @@ Available presets can be listed as follows: cmake --list-presets ``` -By default, all presets: -- Set `BUILD_GUI` to `ON`. -- Set `WITH_QRENCODE` to `OFF`, due to known build issues when using vcpkg's `libqrencode` package. +By default, all presets set `BUILD_GUI` to `ON`. ## Building diff --git a/vcpkg.json b/vcpkg.json index f7b15f9c685..69cfedeae5d 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -25,7 +25,8 @@ "description": "Build GUI, Qt 5", "dependencies": [ "qt5-base", - "qt5-tools" + "qt5-tools", + "libqrencode" ] }, "sqlite": {