Migrate to cooperate ThorVison qml

.github/conan_profiles/macos-15-armv8

@@ -0,0 +1,10 @@
+[settings]
+arch=armv8
+compiler=clang
+compiler.cppstd=gnu20
+compiler.libcxx=libc++
+compiler.version=18
+os=Macos
+os.version=15.0
+[conf]
+tools.cmake.cmaketoolchain:generator=Ninja

.github/conan_profiles/windows-2022-x64

@@ -0,0 +1,9 @@
+[settings]
+arch=x86_64
+compiler=msvc
+compiler.cppstd=20
+compiler.runtime=dynamic
+compiler.version=194
+os=Windows
+[conf]
+tools.cmake.cmaketoolchain:generator=Ninja

.github/workflows/build.yml

@@ -0,0 +1,137 @@
+name: build
+
+on:
+  workflow_dispatch:
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        include:
+          - os: windows-2022
+            arch: x64
+            base_name: windows-x86_64
+          - os: macos-15
+            arch: armv8
+            base_name: macos-armv8
+
+    runs-on: ${{ matrix.os }}
+
+    env:
+      gst_version: 1.26.8
+
+    steps:
+      - uses: actions/checkout@v5
+
+      - name: Setup Compiler (Windows)
+        if: matrix.os == 'windows-2022'
+        uses: ilammy/msvc-dev-cmd@v1
+
+      - name: Setup Compiler (macOS)
+        if: matrix.os == 'macos-15'
+        run: |
+          echo "CC=$(brew --prefix llvm@18)/bin/clang" >> $GITHUB_ENV
+          echo "CXX=$(brew --prefix llvm@18)/bin/clang++" >> $GITHUB_ENV
+
+      - name: Install build tools
+        run: pipx install cmake conan ninja
+
+      - name: Install pkg-config (Windows)
+        if: matrix.os == 'windows-2022'
+        run: choco install pkgconfiglite
+
+      - name: Install conan profile
+        run: conan config install .github/conan_profiles/${{ matrix.os }}-${{ matrix.arch }} -tf profiles
+
+      - name: Cache conan
+        uses: actions/cache@v4
+        with:
+          path: ~/.conan2
+          key: ${{ matrix.base_name }}-conan-${{ hashFiles('conanfile.py') }}
+          restore-keys: ${{ matrix.base_name }}-conan-
+
+      - name: Cache gstreamer
+        uses: actions/cache@v4
+        id: cache-gstreamer
+        with:
+          path: |
+            C:\Program Files\gstreamer
+            /Library/Frameworks/GStreamer.framework
+          key: ${{ matrix.base_name }}-gstreamer-${{ env.gst_version }}
+          restore-keys: ${{ matrix.base_name }}-gstreamer-
+
+      - name: Install gstreamer (Windows)
+        if: matrix.os == 'windows-2022' && steps.cache-gstreamer.outputs.cache-hit != 'true'
+        env:
+          gst_archive: gstreamer-1.0-msvc-x86_64-${{ env.gst_version }}.msi
+          gst_devel_archive: gstreamer-1.0-devel-msvc-x86_64-${{ env.gst_version }}.msi
+        run: |
+          curl -o "${{ env.gst_archive }}" "https://gstreamer.freedesktop.org/data/pkg/windows/${{ env.gst_version }}/msvc/${{ env.gst_archive }}"
+          curl -o "${{ env.gst_devel_archive }}" "https://gstreamer.freedesktop.org/data/pkg/windows/${{ env.gst_version }}/msvc/${{ env.gst_devel_archive }}"
+
+          $log = "install.log" 
+
+          $process = Start-Process "msiexec" "/i `"${{ env.gst_archive }}`" /qn /l*! `"$log`"" -NoNewWindow -PassThru
+          $process_log = Start-Process "powershell" "Get-Content -Path `"$log`" -Wait" -NoNewWindow -PassThru 
+          $process.WaitForExit() 
+          $process_log.Kill()
+
+          $process = Start-Process "msiexec" "/i `"${{ env.gst_devel_archive }}`" /qn /l*! `"$log`"" -NoNewWindow -PassThru
+          $process_log = Start-Process "powershell" "Get-Content -Path `"$log`" -Wait" -NoNewWindow -PassThru 
+          $process.WaitForExit() 
+          $process_log.Kill()
+
+      - name: Install gstreamer (macOS)
+        if: matrix.os == 'macos-15' && steps.cache-gstreamer.outputs.cache-hit != 'true'
+        shell: bash
+        run: |
+          gst_archive=gstreamer-1.0-${{ env.gst_version }}-universal.pkg
+          gst_devel_archive=gstreamer-1.0-devel-${{ env.gst_version }}-universal.pkg
+
+          curl -o "$gst_archive" "https://gstreamer.freedesktop.org/data/pkg/osx/${{ env.gst_version }}/$gst_archive"
+          curl -o "$gst_devel_archive" "https://gstreamer.freedesktop.org/data/pkg/osx/${{ env.gst_version }}/$gst_devel_archive"
+
+          sudo installer -pkg $gst_archive -target /
+          sudo installer -pkg $gst_devel_archive -target /
+
+      - name: Setup conan index
+        run: |
+          git clone --depth 1 --branch master https://github.com/kontex-neuro/kontex-conan.git kontex-conan
+          conan remote add --force kontex-neuro ./kontex-conan
+
+      - name: Build & Install (Windows)
+        if: matrix.os == 'windows-2022'
+        env:
+          PKG_CONFIG_PATH: "C:\\Program Files\\gstreamer\\1.0\\msvc_x86_64\\lib\\pkgconfig"
+        run: |
+          conan install . -b missing -pr:a ${{ matrix.os }}-${{ matrix.arch }} -s build_type=Release
+          cmake -S . -B build/Release --preset conan-release -G "Ninja" -DCMAKE_INSTALL_PREFIX=build/install -DCMAKE_BUILD_TYPE=Release
+          cmake --build build/Release --target install
+
+      - name: Build & Install (macOS)
+        if: matrix.os == 'macos-15'
+        env:
+          PKG_CONFIG_PATH: /Library/Frameworks/GStreamer.framework/Versions/1.0/lib/pkgconfig
+        run: |
+          conan install . -b missing -pr:a ${{ matrix.os }}-${{ matrix.arch }} -s build_type=Release
+          cmake -S . -B build/Release --preset conan-release -G "Ninja" -DCMAKE_INSTALL_PREFIX=build/install -DCMAKE_BUILD_TYPE=Release
+          cmake --build build/Release --target install
+
+      - name: Get & Set version
+        shell: bash
+        run: |
+          version=$(conan inspect -f json . | jq -r '.version')
+          echo $version
+          echo "version=$version" >> $GITHUB_ENV
+
+      - name: Zip
+        shell: bash
+        run: |
+          mv build/install ${{ matrix.base_name }}
+          7z a ${{ matrix.base_name }}-${{ env.version }}.zip ${{ matrix.base_name }}
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.base_name }}
+          path: ${{ matrix.base_name }}-${{ env.version }}.zip

.gitignore

@@ -1,18 +1,22 @@
 # IDE, Editor
+__pycache__/
+*.py[cod]
 /*.pro.user*
 /.vscode
 
 # OS
 .DS_Store
 
 # Build
-/build*
-/.venv
-/.cache
-/CMakeUserPresets.json
+dist/
+build/
+.venv/
+.cache/
+CMakeUserPresets.json
 
 # clang
 .clangd
 
 *.log
-*.mkv
+*.mkv
+*.sh

CMakeLists.txt

@@ -1,50 +1,146 @@
 cmake_minimum_required(VERSION 3.25)
 
-set(libxvc_VERSION 0.1.0)
+set(libxvc_VERSION 0.2.1)
 
 project(libxvc
     LANGUAGES CXX
     VERSION "${libxvc_VERSION}"
-    DESCRIPTION "Thor Vision Video Capture Library"
-    HOMEPAGE_URL "https://www.kontex.io/" 
 )
 
-if(APPLE)
-    add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-fexperimental-library>)
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+set(Boost_USE_STATIC_LIBS ON)
+if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+    set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/install" CACHE PATH "default install path" FORCE)
 endif()
 
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
-set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+option(BUILD_SHARED_LIBS "Build as shared library" OFF)
+option(BUILD_TESTS "Build tests" OFF)
+option(BUILD_TOOLS "Build tools" OFF)
+# option(BUILD_PYTHON_BINDINGS "Build python bindings" ON)
+# option(BUILD_PYTHON_STUBS "Build python stubs" OFF)
+option(USE_ASAN "Enable AddressSanitizer (ASan)" OFF)
+option(USE_UBSAN "Enable UndefinedBehaviorSanitizer (UBSan)" OFF)
+option(USE_TSAN "Enable ThreadSanitizer (TSan)" OFF)
+
+if(USE_ASAN AND USE_TSAN)
+    message(
+        FATAL_ERROR
+        "AddressSanitizer (ASan) and ThreadSanitizer (TSan) are mutually exclusive and cannot be enabled at the same time."
+    )
+endif()
+
+set(SANITIZER_COMPILE_FLAGS "")
+set(SANITIZER_LINK_FLAGS "")
+
+if(USE_ASAN)
+    if(WIN32 AND MSVC)
+        list(APPEND SANITIZER_COMPILE_FLAGS /fsanitize=address)
+        list(APPEND SANITIZER_LINK_FLAGS /fsanitize=address)
+    else()
+        list(APPEND SANITIZER_COMPILE_FLAGS -fsanitize=address)
+        list(APPEND SANITIZER_LINK_FLAGS -fsanitize=address)
+        if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+            list(APPEND SANITIZER_LINK_FLAGS -lpthread)
+        endif()
+    endif()
+endif()
+
+if(USE_UBSAN)
+    if(WIN32 AND MSVC)
+        if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+            list(APPEND SANITIZER_COMPILE_FLAGS -fsanitize=undefined)
+            list(APPEND SANITIZER_LINK_FLAGS -fsanitize=undefined)
+        else()
+            message(
+                WARNING
+                "UndefinedBehaviorSanitizer (UBSan) is not directly supported via a simple flag in MSVC."
+            )
+        endif()
+    else()
+        list(APPEND SANITIZER_COMPILE_FLAGS -fsanitize=undefined)
+        list(APPEND SANITIZER_LINK_FLAGS -fsanitize=undefined)
+    endif()
+endif()
+
+if(USE_TSAN)
+    if(WIN32 AND MSVC)
+        message(
+            FATAL_ERROR
+            "ThreadSanitizer (TSan) is not supported by the MSVC compiler. Please use Clang or GCC."
+        )
+    elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+        message(FATAL_ERROR "ThreadSanitizer (TSan) is not supported on macOS.")
+    else()
+        list(APPEND SANITIZER_COMPILE_FLAGS -fsanitize=thread)
+        list(APPEND SANITIZER_LINK_FLAGS -fsanitize=thread)
+        if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+            list(APPEND SANITIZER_LINK_FLAGS -lpthread)
+        endif()
+    endif()
+endif()
+
+add_library(xvc)
+
+target_compile_options(xvc PUBLIC ${SANITIZER_COMPILE_FLAGS})
+target_link_options(xvc PUBLIC ${SANITIZER_LINK_FLAGS})
 
-set(Boost_USE_STATIC_LIBS ON)
-find_package(fmt REQUIRED)
 find_package(spdlog REQUIRED)
 find_package(nlohmann_json REQUIRED)
+find_package(nlohmann_json_schema_validator REQUIRED)
 find_package(cpr REQUIRED)
-find_package(xdaqmetadata REQUIRED)
 find_package(Boost 1.81.0 REQUIRED)
-find_package(CLI11 REQUIRED)
-find_package(OpenSSL REQUIRED)
-
 find_package(PkgConfig REQUIRED)
 pkg_search_module(gstreamer REQUIRED IMPORTED_TARGET gstreamer-1.0>=1.4)
-pkg_search_module(gstreamer-app REQUIRED IMPORTED_TARGET gstreamer-app-1.0>=1.4)
-pkg_search_module(gstreamer-video REQUIRED IMPORTED_TARGET gstreamer-video-1.0>=1.4)
 
 add_subdirectory(xdaqvc)
-add_subdirectory(tool)
 
-if(BUILD_TESTING)
+if(BUILD_TESTS)
     enable_testing()
-    find_package(GTest REQUIRED)
     find_package(Catch2 REQUIRED)
-    include(CTest)
-    add_subdirectory(test)
+    add_subdirectory(tests)
 endif()
 
-include(CMakePackageConfigHelpers)
+if(BUILD_TOOLS)
+    find_package(xdaqmetadata REQUIRED)
+    find_package(CLI11 REQUIRED)
+    pkg_search_module(gstreamer-app REQUIRED IMPORTED_TARGET gstreamer-app-1.0>=1.4)
+    pkg_search_module(gstreamer-video REQUIRED IMPORTED_TARGET gstreamer-video-1.0>=1.4)
+    add_subdirectory(tools)
+endif()
+
+# if(BUILD_PYTHON_BINDINGS)
+#     find_package(Python 3.9 
+#         REQUIRED COMPONENTS Interpreter Development.Module
+#         # OPTIONAL_COMPONENTS Development.SABIModule
+#     )
+#     find_package(nanobind CONFIG REQUIRED)
+#     add_subdirectory(python/src)
+# endif()
+
 include(GNUInstallDirs)
 
+install(
+    TARGETS xvc
+    EXPORT libxvc-targets
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    FILE_SET "public_headers" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/xdaqvc
+)
+install(
+    EXPORT libxvc-targets
+    FILE libxvc-targets.cmake
+    NAMESPACE libxvc::
+    DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/libxvc"
+)
+export(
+    EXPORT libxvc-targets 
+    FILE libxvc-config.cmake
+    NAMESPACE libxvc::
+)
+
+include(CMakePackageConfigHelpers)
+
 configure_package_config_file(
     "${CMAKE_CURRENT_SOURCE_DIR}/cmake/libxvc-config.cmake.in"
     "${CMAKE_CURRENT_BINARY_DIR}/libxvc-config.cmake"