diff options
| author | Alexander Blair <snipa@jagtech.io> | 2021-01-03 18:45:13 -0800 |
|---|---|---|
| committer | Alexander Blair <snipa@jagtech.io> | 2021-01-03 18:45:26 -0800 |
| commit | bbe371654258c25d034c07783e5ae776c2f60d90 (patch) | |
| tree | 51e2161b29317061a4ae2f02cee4d70c9071a81c /src/CMakeLists.txt | |
| parent | 8e6a2cde0fd0e8c2a71456ea8bb36db49116d705 (diff) | |
| parent | 8d4cda030e445d2b64cc327af125b538e014ecb0 (diff) | |
| download | monzero-gui-bbe371654258c25d034c07783e5ae776c2f60d90.tar.gz monzero-gui-bbe371654258c25d034c07783e5ae776c2f60d90.tar.xz monzero-gui-bbe371654258c25d034c07783e5ae776c2f60d90.zip | |
Merge pull request #3277
8d4cda03 QR-Code-scanner: integrate QUIRC library, implement QrDecoder, drop ZBar (xiphon)
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f0f6eec5..de675eb8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -55,13 +55,6 @@ if(ENABLE_PASS_STRENGTH_METER) ) endif() -if(WITH_SCANNER) - file(GLOB QR_CODE_FILES - "QR-Code-scanner/*.h" - "QR-Code-scanner/*.cpp" - ) -endif() - set(EXECUTABLE_FLAG) if(MINGW) set(EXECUTABLE_FLAG WIN32) @@ -84,7 +77,6 @@ endif() set(monero_wallet_gui_sources ${SOURCE_FILES} ${PASS_STRENGTH_FILES} - ${QR_CODE_FILES} ${RESOURCES} ) @@ -128,7 +120,6 @@ target_include_directories(monero-wallet-gui PUBLIC ${X11_INCLUDE_DIR} ${Boost_INCLUDE_DIRS} ${OPENSSL_INCLUDE_DIR} - ${ZBAR_INCLUDE_DIR} ) target_compile_definitions(monero-wallet-gui @@ -167,6 +158,7 @@ target_link_libraries(monero-wallet-gui ${EXTRA_LIBRARIES} ${ICU_LIBRARIES} openpgp + qrdecoder translations ) @@ -179,16 +171,14 @@ if(X11_FOUND) endif() if(WITH_SCANNER) - if(NOT ANDROID) + target_link_libraries(monero-wallet-gui qrscanner) + if(LINUX AND NOT ANDROID) target_link_libraries(monero-wallet-gui - ${ZBAR_LIBRARIES} jpeg v4l2 v4lconvert rt ) - else() - target_link_libraries(monero-wallet-gui ${ZBAR_LIBRARIES}) endif() endif() |