status-im
/
qzxing
mirror of https://github.com/status-im/qzxing.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Properly exported the defines for CMake users 

- CMake users can now use QZXING_USE_ENCODER to enable QR code encoding
- definitions are export correctly for including projects
- CMake users no longer have to manually add the definitions into src/CMakeLists.txt
This commit is contained in:
Philip Schuchardt 2021-07-05 21:46:35 -04:00
parent 9973b3dd78
commit f5c99d347b
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/CMakeLists.txt
View File

@ -38,6 +38,10 @@ if(QZXING_USE_QML)
add_definitions(-DQZXING_QML) add_definitions(-DQZXING_QML)
endif(QZXING_USE_QML) endif(QZXING_USE_QML)
if(QZXING_USE_ENCODER)
add_definitions(-DENABLE_ENCODER_GENERIC -DENABLE_ENCODER_QR_CODE)
endif(QZXING_USE_ENCODER)
add_library(qzxing "" ${SOURCES}) add_library(qzxing "" ${SOURCES})
if(WIN32) if(WIN32)
@ -61,6 +65,7 @@ target_link_libraries(qzxing Qt5::Core Qt5::Gui)
if(QZXING_MULTIMEDIA) if(QZXING_MULTIMEDIA)
target_link_libraries(qzxing Qt5::Multimedia) target_link_libraries(qzxing Qt5::Multimedia)
target_compile_definitions(qzxing PUBLIC -DQZXING_MULTIMEDIA)
endif(QZXING_MULTIMEDIA) endif(QZXING_MULTIMEDIA)
if(QZXING_USE_QML) if(QZXING_USE_QML)
@ -68,8 +73,13 @@ if(QZXING_USE_QML)
Qt5::Svg Qt5::Svg
Qt5::Quick Qt5::Quick
Qt5::QuickControls2) Qt5::QuickControls2)
target_compile_definitions(qzxing PUBLIC -DQZXING_QML)
endif(QZXING_USE_QML) endif(QZXING_USE_QML)
if(QZXING_USE_ENCODER)
target_compile_definitions(qzxing PUBLIC -DENABLE_ENCODER_GENERIC -DENABLE_ENCODER_QR_CODE)
endif(QZXING_USE_ENCODER)
# Change Global Definitions depending on how you want to use the library # Change Global Definitions depending on how you want to use the library
target_compile_definitions(qzxing PUBLIC DISABLE_LIBRARY_FEATURES) target_compile_definitions(qzxing PUBLIC DISABLE_LIBRARY_FEATURES)