-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
12 changed files
with
235 additions
and
181 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,89 +1,90 @@ | ||
|
|
||
| if(EMSCRIPTEN) | ||
| find_package(Qt6 COMPONENTS Core Gui Qml Quick ShaderTools) | ||
| find_package(Qt6 COMPONENTS Core Gui Qml Quick ShaderTools) | ||
| else() | ||
| find_package(Qt6 COMPONENTS Core Gui Qml Quick ShaderTools Multimedia) | ||
| find_package(Qt6 COMPONENTS Core Gui Qml Quick ShaderTools Multimedia) | ||
| endif(EMSCRIPTEN) | ||
|
|
||
| FetchContent_Declare( | ||
| EstervDesigns | ||
| GIT_REPOSITORY https://github.com/EddyTheCo/MyDesigns.git | ||
| GIT_TAG develop | ||
| FIND_PACKAGE_ARGS 1.1 COMPONENTS SimpleStyle CustomControls CONFIG | ||
| ) | ||
| EstervDesigns | ||
| GIT_REPOSITORY https://github.com/EddyTheCo/MyDesigns.git | ||
| GIT_TAG develop | ||
| FIND_PACKAGE_ARGS 1.1 COMPONENTS SimpleStyle CustomControls CONFIG | ||
| ) | ||
| FetchContent_MakeAvailable(EstervDesigns) | ||
|
|
||
|
|
||
| if (Qt6_FOUND AND TARGET QrDec) | ||
| qt_standard_project_setup() | ||
| qt6_add_qml_module(QtQrDec | ||
| URI Esterv.CustomControls.QrDec | ||
| VERSION 1.0 | ||
| SOURCES Qrimagedecoder.cpp include/Qrimagedecoder.hpp | ||
| QML_FILES | ||
| "qml/QrCam.qml" | ||
| "qml/QrDecPop.qml" | ||
| "qml/QrTextField.qml" | ||
| RESOURCE_PREFIX | ||
| "/esterVtech.com/imports" | ||
| OUTPUT_TARGETS out_targets_var | ||
| OUTPUT_DIRECTORY | ||
| ${CMAKE_BINARY_DIR}/Esterv/CustomControls/QrDec | ||
| IMPORT_PATH ${CMAKE_BINARY_DIR} ${CMAKE_INSTALL_LIBDIR} | ||
| ) | ||
| qt_standard_project_setup() | ||
| qt6_add_qml_module(QtQrDec | ||
| URI Esterv.CustomControls.QrDec | ||
| VERSION 1.0 | ||
| SOURCES Qrimagedecoder.cpp include/Qrimagedecoder.hpp | ||
| QML_FILES | ||
| "qml/QrCam.qml" | ||
| "qml/QrDecPop.qml" | ||
| "qml/QrTextField.qml" | ||
| RESOURCE_PREFIX | ||
| "/esterVtech.com/imports" | ||
| OUTPUT_TARGETS out_targets_var | ||
| OUTPUT_DIRECTORY | ||
| ${CMAKE_BINARY_DIR}/Esterv/CustomControls/QrDec | ||
| IMPORT_PATH ${CMAKE_BINARY_DIR} ${CMAKE_INSTALL_LIBDIR} | ||
| ) | ||
|
|
||
| add_library(${PROJECT_NAME}::QtQrDec ALIAS QtQrDec) | ||
| add_library(${PROJECT_NAME}::QtQrDecplugin ALIAS QtQrDecplugin) | ||
| target_compile_definitions(QtQrDec PRIVATE WINDOWS_DEC) | ||
| add_library(${PROJECT_NAME}::QtQrDec ALIAS QtQrDec) | ||
| add_library(${PROJECT_NAME}::QtQrDecplugin ALIAS QtQrDecplugin) | ||
| target_compile_definitions(QtQrDec PRIVATE WINDOWS_DEC) | ||
| set_target_properties(QtQrDec PROPERTIES VERSION ${VERSION} SOVERSION ${VERSION_MAJOR}) | ||
|
|
||
| qt6_add_shaders(QtQrDec "esterVtech.com.imports.QtQrDec.shaders" | ||
| BATCHABLE | ||
| PRECOMPILE | ||
| OPTIMIZED | ||
| OUTPUT_TARGETS out_targets_var2 | ||
| PREFIX | ||
| "/esterVtech.com/imports/Designs" | ||
| FILES | ||
| "frag/qrscanner.frag" | ||
| ) | ||
| target_include_directories(QtQrDec PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> | ||
| "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/Esterv/${PROJECT_NAME}>") | ||
| if(EMSCRIPTEN) | ||
| target_compile_definitions(QtQrDec PRIVATE USE_EMSCRIPTEN) | ||
| else() | ||
| target_link_libraries(QtQrDec PUBLIC Qt6::Multimedia) | ||
| endif(EMSCRIPTEN) | ||
| target_link_libraries(QtQrDec PUBLIC Qt6::Gui Qt6::Quick QrDec | ||
| EstervDesigns::SimpleStyle EstervDesigns::CustomControls | ||
| $<$<STREQUAL:$<TARGET_PROPERTY:EstervDesigns::SimpleStyle,TYPE>,STATIC_LIBRARY>:EstervDesigns::SimpleStyleplugin> | ||
| $<$<STREQUAL:$<TARGET_PROPERTY:EstervDesigns::CustomControls,TYPE>,STATIC_LIBRARY>:EstervDesigns::CustomControlsplugin>) | ||
| qt6_add_shaders(QtQrDec "esterVtech.com.imports.QtQrDec.shaders" | ||
| BATCHABLE | ||
| PRECOMPILE | ||
| OPTIMIZED | ||
| OUTPUT_TARGETS out_targets_var2 | ||
| PREFIX | ||
| "/esterVtech.com/imports/Designs" | ||
| FILES | ||
| "frag/qrscanner.frag" | ||
| ) | ||
| target_include_directories(QtQrDec PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> | ||
| "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/Esterv/>") | ||
| if(EMSCRIPTEN) | ||
| target_compile_definitions(QtQrDec PRIVATE USE_EMSCRIPTEN) | ||
| else() | ||
| target_link_libraries(QtQrDec PUBLIC Qt6::Multimedia) | ||
| endif(EMSCRIPTEN) | ||
| target_link_libraries(QtQrDec PUBLIC Qt6::Gui Qt6::Quick QrDec | ||
| EstervDesigns::SimpleStyle EstervDesigns::CustomControls | ||
| $<$<STREQUAL:$<TARGET_PROPERTY:EstervDesigns::SimpleStyle,TYPE>,STATIC_LIBRARY>:EstervDesigns::SimpleStyleplugin> | ||
| $<$<STREQUAL:$<TARGET_PROPERTY:EstervDesigns::CustomControls,TYPE>,STATIC_LIBRARY>:EstervDesigns::CustomControlsplugin>) | ||
|
|
||
| install(TARGETS QtQrDec ${out_targets_var} ${out_targets_var2} | ||
| EXPORT ${PROJECT_NAME}-config | ||
| DESTINATION ${CMAKE_INSTALL_LIBDIR} | ||
| COMPONENT QtQrDec | ||
| ) | ||
| install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/include/ | ||
| DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/Esterv/${PROJECT_NAME} | ||
| COMPONENT QtQrDec | ||
| ) | ||
| install(DIRECTORY ${CMAKE_BINARY_DIR}/Esterv/CustomControls/QrDec | ||
| DESTINATION ${CMAKE_INSTALL_LIBDIR}/Esterv/CustomControls | ||
| COMPONENT QtQrDec | ||
| ) | ||
| install(TARGETS QtQrDec ${out_targets_var} ${out_targets_var2} | ||
| EXPORT ${PROJECT_NAME}-config | ||
| DESTINATION ${CMAKE_INSTALL_LIBDIR} | ||
| COMPONENT QtQrDec | ||
| ) | ||
| install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/include/ | ||
| DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/Esterv | ||
| COMPONENT QtQrDec | ||
| ) | ||
| install(DIRECTORY ${CMAKE_BINARY_DIR}/Esterv/CustomControls/QrDec | ||
| DESTINATION ${CMAKE_INSTALL_LIBDIR}/Esterv/CustomControls | ||
| COMPONENT QtQrDec | ||
| ) | ||
|
|
||
| install(TARGETS QtQrDecplugin | ||
| EXPORT ${PROJECT_NAME}-config | ||
| DESTINATION ${CMAKE_INSTALL_LIBDIR}/Esterv/CustomControls/QrDec | ||
| COMPONENT QtQrDec | ||
| ) | ||
| install(TARGETS QtQrDecplugin | ||
| EXPORT ${PROJECT_NAME}-config | ||
| DESTINATION ${CMAKE_INSTALL_LIBDIR}/Esterv/CustomControls/QrDec | ||
| COMPONENT QtQrDec | ||
| ) | ||
|
|
||
| if(EMSCRIPTEN) | ||
| target_compile_definitions(QtQrDec PRIVATE USE_EMSCRIPTEN) | ||
| endif(EMSCRIPTEN) | ||
| if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) | ||
| add_subdirectory(examples) | ||
| endif(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) | ||
| if(EMSCRIPTEN) | ||
| target_compile_definitions(QtQrDec PRIVATE USE_EMSCRIPTEN) | ||
| endif(EMSCRIPTEN) | ||
| if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) | ||
| add_subdirectory(examples) | ||
| endif(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) | ||
| else(Qt6_FOUND AND TARGET QrDec) | ||
| message(STATUS "The QML Module for QRCODE decoding will not be built") | ||
| message(STATUS "The QML Module for QRCODE decoding will not be built") | ||
| endif(Qt6_FOUND AND TARGET QrDec) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.