Work on the build system

Author: emericg

CMakeLists.txt

@@ -11,9 +11,9 @@ set(CMAKE_AUTORCC ON)
 set(APP_NAME ${CMAKE_PROJECT_NAME})
 set(APP_VERSION ${CMAKE_PROJECT_VERSION})
 
-option(USE_QZXING "Build with QZXing support (decoder&encoder)"                 OFF)
-option(USE_ZXINGCPP "Build with zxing-cpp support (decoder&encoder)"            ON)
 option(USE_ZINT "Build with zint support (encoder)"                             ON)
+option(USE_ZXINGCPP "Build with zxing-cpp support (decoder & encoder)"          ON)
+option(USE_QZXING "Build with QZXing support (decoder & encoder) (LEGACY)"      OFF)
 
 ################################################################################
 

thirdparty/zint-qml/wrappers/qml/CMakeLists.txt

@@ -1,20 +1,32 @@
+cmake_minimum_required(VERSION 3.20)
+
+project(ZintQml LANGUAGES CXX)
+
+set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+################################################################################
 
 set(SOURCES
     ZintQml.cpp ZintQml.h
     ZintImageProvider.cpp ZintImageProvider.h
 )
 
-add_library(ZintQml ${SOURCES})
+################################################################################
+
+find_package(Qt6 6.5 REQUIRED COMPONENTS Core Quick)
+
+qt_add_library(ZintQml STATIC ${SOURCES})
 
 if (BUILD_SHARED_LIBS)
     target_link_libraries(ZintQml PRIVATE zint)
 else()
     target_link_libraries(ZintQml PRIVATE zint-static)
 endif()
 
-target_include_directories(ZintQml PRIVATE zint)
-
-find_package(Qt6 REQUIRED COMPONENTS Core Quick)
 target_link_libraries(ZintQml PRIVATE Qt6::Core Qt6::Quick)
 
-target_include_directories(ZintQml PUBLIC ${CMAKE_CURRENT_LIST_DIR})
+target_include_directories(ZintQml PRIVATE zint)
+target_include_directories(ZintQml PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+
+################################################################################

thirdparty/zxing-cpp/wrappers/qt/CMakeLists.txt

@@ -1,3 +1,11 @@
+cmake_minimum_required(VERSION 3.20)
+
+project(ZXingQt LANGUAGES CXX)
+
+set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+################################################################################
 
 set(SOURCES
     ZXingQt.cpp
@@ -18,14 +26,17 @@ if(ZXING_WRITERS)
     )
 endif()
 
-add_library(ZXingQt ${SOURCES})
+################################################################################
 
-target_link_libraries(ZXingQt PRIVATE ZXing::ZXing)
-target_include_directories(ZXingQt PRIVATE ZXing::ZXing)
+find_package(Qt6 6.5 REQUIRED COMPONENTS Core Concurrent Quick Multimedia)
+
+qt_add_library(ZXingQt STATIC ${SOURCES})
 
-find_package(Qt6 REQUIRED COMPONENTS Core Concurrent Quick Multimedia)
+target_link_libraries(ZXingQt PRIVATE ZXing::ZXing)
 target_link_libraries(ZXingQt PRIVATE Qt6::Core Qt6::Concurrent Qt6::Quick Qt6::Multimedia)
+#qt_add_ios_ffmpeg_libraries(ZXingQt)
 
-qt_add_ios_ffmpeg_libraries(ZXingQt)
+target_include_directories(ZXingQt PRIVATE ZXing::ZXing)
+target_include_directories(ZXingQt PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
-target_include_directories(ZXingQt PUBLIC ${CMAKE_CURRENT_LIST_DIR})
+################################################################################