Eddy the co patch 1 (#62) (#63)

Use correct estervdesigns
EddyTheCo · Dec 27, 2023 · 2adb07f · 2adb07f
1 parent 47c8362
commit 2adb07f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/Config.cmake.in b/Config.cmake.in
@@ -1,6 +1,6 @@
 @PACKAGE_INIT@
 include(CMakeFindDependencyMacro)
 find_dependency(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick Svg OPTIONAL_COMPONENTS Multimedia )
-find_dependency(OpenCV REQUIRED COMPONENTS core objdetect )
+find_dependency(OpenCV REQUIRED COMPONENTS core objdetect imgproc flann features2d calib3d )
 find_dependency(EstervDesigns 1.0 COMPONENTS SimpleStyle CustomControls CONFIG)
-include ( "${CMAKE_CURRENT_LIST_DIR}/qrCodeTargets.cmake" )
+include ( "${CMAKE_CURRENT_LIST_DIR}/qrCode-config.cmake" )
diff --git a/QtQrDec/CMakeLists.txt b/QtQrDec/CMakeLists.txt
@@ -8,7 +8,7 @@ endif(EMSCRIPTEN)
 FetchContent_Declare(
     EstervDesigns
     GIT_REPOSITORY https://github.com/EddyTheCo/MyDesigns.git
-    GIT_TAG v1.0.0
+    GIT_TAG develop
     FIND_PACKAGE_ARGS 1.0 COMPONENTS SimpleStyle CustomControls CONFIG
 )
 FetchContent_MakeAvailable(EstervDesigns)
@@ -54,9 +54,9 @@ else()
     target_link_libraries(QtQrDec PUBLIC Qt6::Multimedia)
 endif(EMSCRIPTEN)
 target_link_libraries(QtQrDec PUBLIC Qt6::Gui Qt6::Quick QrDec
-    EstervDesigns::SimpleStyle EstervDesigns::customControls
+    EstervDesigns::SimpleStyle EstervDesigns::CustomControls
     $<$<STREQUAL:$<TARGET_PROPERTY:EstervDesigns::SimpleStyle,TYPE>,STATIC_LIBRARY>:EstervDesigns::SimpleStyleplugin>
-    $<$<STREQUAL:$<TARGET_PROPERTY:EstervDesigns::customControls,TYPE>,STATIC_LIBRARY>:EstervDesigns::customControlsplugin>)
+    $<$<STREQUAL:$<TARGET_PROPERTY:EstervDesigns::CustomControls,TYPE>,STATIC_LIBRARY>:EstervDesigns::CustomControlsplugin>)
 
 install(TARGETS QtQrDec ${out_targets_var} ${out_targets_var2}
     EXPORT ${PROJECT_NAME}-config

diff --git a/QtQrGen/CMakeLists.txt b/QtQrGen/CMakeLists.txt
@@ -47,9 +47,9 @@ target_link_libraries(QtQrGen PUBLIC
     Qt6::Quick
 )
 target_link_libraries(QtQrGen PRIVATE QrGen Qt6::Core Qt6::Gui Qt6::Qml Qt6::Svg
-    EstervDesigns::SimpleStyle EstervDesigns::customControls
+    EstervDesigns::SimpleStyle EstervDesigns::CustomControls
     $<$<STREQUAL:$<TARGET_PROPERTY:EstervDesigns::SimpleStyle,TYPE>,STATIC_LIBRARY>:EstervDesigns::SimpleStyleplugin>
-    $<$<STREQUAL:$<TARGET_PROPERTY:EstervDesigns::customControls,TYPE>,STATIC_LIBRARY>:EstervDesigns::customControlsplugin>)
+    $<$<STREQUAL:$<TARGET_PROPERTY:EstervDesigns::CustomControls,TYPE>,STATIC_LIBRARY>:EstervDesigns::CustomControlsplugin>)
 
 install(TARGETS QtQrGen ${out_targets_var} ${out_targets_var2}
     EXPORT ${PROJECT_NAME}-config