From e86afe11f8a9d7fa5f137e3b90bad32366fbc916 Mon Sep 17 00:00:00 2001 From: Nicholas Guriev Date: Tue, 11 Feb 2020 16:50:25 +0300 Subject: [PATCH] Fix path for packaged QR-code generator * Check for the "qrcodegen" subfolder in addition to "qrcodegencpp". * Properly set an include flag as a library header is included with no directory name. --- external/qr_code_generator/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/external/qr_code_generator/CMakeLists.txt b/external/qr_code_generator/CMakeLists.txt index 5e3e9e9..fdb3a76 100644 --- a/external/qr_code_generator/CMakeLists.txt +++ b/external/qr_code_generator/CMakeLists.txt @@ -8,11 +8,11 @@ if (DESKTOP_APP_USE_PACKAGED_QRCODE) add_library(external_qr_code_generator INTERFACE IMPORTED GLOBAL) add_library(desktop-app::external_qr_code_generator ALIAS external_qr_code_generator) - find_library(QRCODE_LIBRARY NAMES "qrcodegencpp") - find_path(QRCODE_INCLUDE_DIRS "qrcodegencpp/QrCode.hpp") + find_library(QRCODE_LIBRARIES NAMES qrcodegencpp) + find_path(QRCODE_INCLUDE_DIRS QrCode.hpp PATH_SUFFIXES qrcodegencpp qrcodegen) target_include_directories(external_qr_code_generator INTERFACE ${QRCODE_INCLUDE_DIRS}) - target_link_libraries(external_qr_code_generator INTERFACE ${QRCODE_LIBRARY}) + target_link_libraries(external_qr_code_generator INTERFACE ${QRCODE_LIBRARIES}) else() add_library(external_qr_code_generator OBJECT) add_library(desktop-app::external_qr_code_generator ALIAS external_qr_code_generator)