From 402ba10b20b05a2bf0a3d5e9270f1ad88021ba48 Mon Sep 17 00:00:00 2001 From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Date: Thu, 25 Jun 2026 15:04:29 +0100 Subject: [PATCH 1/3] cmake: Drop optional `PkgConfig` use in `FindQRencode` module --- cmake/module/FindQRencode.cmake | 9 --------- 1 file changed, 9 deletions(-) diff --git a/cmake/module/FindQRencode.cmake b/cmake/module/FindQRencode.cmake index 575bfecc8b1..aa0e8222ab3 100644 --- a/cmake/module/FindQRencode.cmake +++ b/cmake/module/FindQRencode.cmake @@ -14,23 +14,15 @@ This is a wrapper around find_package()/pkg_check_modules() commands that: #]=======================================================================] -find_package(PkgConfig QUIET) -if(PKG_CONFIG_FOUND) - pkg_check_modules(PC_QRencode QUIET libqrencode) -endif() - find_path(QRencode_INCLUDE_DIR NAMES qrencode.h - HINTS ${PC_QRencode_INCLUDE_DIRS} ) find_library(QRencode_LIBRARY_RELEASE NAMES qrencode - HINTS ${PC_QRencode_LIBRARY_DIRS} ) find_library(QRencode_LIBRARY_DEBUG NAMES qrencoded qrencode - HINTS ${PC_QRencode_LIBRARY_DIRS} ) include(SelectLibraryConfigurations) select_library_configurations(QRencode) @@ -38,7 +30,6 @@ select_library_configurations(QRencode) include(FindPackageHandleStandardArgs) find_package_handle_standard_args(QRencode REQUIRED_VARS QRencode_LIBRARY QRencode_INCLUDE_DIR - VERSION_VAR PC_QRencode_VERSION ) if(QRencode_FOUND) From 5c55606da9ba8b701718e1c84751979c8e87e4f7 Mon Sep 17 00:00:00 2001 From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Date: Thu, 25 Jun 2026 15:30:14 +0100 Subject: [PATCH 2/3] depends: Remove unused `lib/pkgconfig` in `qrencode` package --- depends/packages/qrencode.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/depends/packages/qrencode.mk b/depends/packages/qrencode.mk index e3f614091db..da3aafea41b 100644 --- a/depends/packages/qrencode.mk +++ b/depends/packages/qrencode.mk @@ -30,5 +30,5 @@ define $(package)_stage_cmds endef define $(package)_postprocess_cmds - rm -rf share + rm -rf share lib/pkgconfig endef From 829255c8bedc033ddb518fae43050c4ca10caf6a Mon Sep 17 00:00:00 2001 From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Date: Thu, 25 Jun 2026 16:33:40 +0100 Subject: [PATCH 3/3] cmake: Remove `SelectLibraryConfigurations` from `FindQRencode` module Co-authored-by: Daniel Pfeifer --- cmake/module/FindQRencode.cmake | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/cmake/module/FindQRencode.cmake b/cmake/module/FindQRencode.cmake index aa0e8222ab3..7c213989eb9 100644 --- a/cmake/module/FindQRencode.cmake +++ b/cmake/module/FindQRencode.cmake @@ -17,33 +17,25 @@ This is a wrapper around find_package()/pkg_check_modules() commands that: find_path(QRencode_INCLUDE_DIR NAMES qrencode.h ) - find_library(QRencode_LIBRARY_RELEASE NAMES qrencode ) find_library(QRencode_LIBRARY_DEBUG NAMES qrencoded qrencode ) -include(SelectLibraryConfigurations) -select_library_configurations(QRencode) include(FindPackageHandleStandardArgs) find_package_handle_standard_args(QRencode - REQUIRED_VARS QRencode_LIBRARY QRencode_INCLUDE_DIR + REQUIRED_VARS QRencode_LIBRARY_RELEASE QRencode_INCLUDE_DIR ) -if(QRencode_FOUND) - if(NOT TARGET QRencode::QRencode) - add_library(QRencode::QRencode UNKNOWN IMPORTED) - endif() - if(QRencode_LIBRARY_RELEASE) - set_property(TARGET QRencode::QRencode APPEND PROPERTY - IMPORTED_CONFIGURATIONS RELEASE - ) - set_target_properties(QRencode::QRencode PROPERTIES - IMPORTED_LOCATION_RELEASE "${QRencode_LIBRARY_RELEASE}" - ) - endif() +if(QRencode_FOUND AND NOT TARGET QRencode::QRencode) + add_library(QRencode::QRencode UNKNOWN IMPORTED) + set_target_properties(QRencode::QRencode PROPERTIES + IMPORTED_CONFIGURATIONS RELEASE + IMPORTED_LOCATION_RELEASE "${QRencode_LIBRARY_RELEASE}" + INTERFACE_INCLUDE_DIRECTORIES "${QRencode_INCLUDE_DIR}" + ) if(QRencode_LIBRARY_DEBUG) set_property(TARGET QRencode::QRencode APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG @@ -52,11 +44,10 @@ if(QRencode_FOUND) IMPORTED_LOCATION_DEBUG "${QRencode_LIBRARY_DEBUG}" ) endif() - set_target_properties(QRencode::QRencode PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES "${QRencode_INCLUDE_DIR}" - ) endif() mark_as_advanced( QRencode_INCLUDE_DIR + QRencode_LIBRARY_RELEASE + QRencode_LIBRARY_DEBUG )