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.
This commit is contained in:
parent
8bc157ce03
commit
e86afe11f8
1 changed files with 3 additions and 3 deletions
6
external/qr_code_generator/CMakeLists.txt
vendored
6
external/qr_code_generator/CMakeLists.txt
vendored
|
|
@ -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)
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue