Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ class libxvc(ConanFile):
description = "Thor Vision Video Capture library"
options = {"build_testing": [True, False]}
default_options = {"build_testing": False}
exports_sources = "CMakeLists.txt", "cmake/*", "xdaqvc/*", "tool/*", "test/*"

def build_requirements(self):
self.tool_requires("cmake/[>=3.25.0 <3.30.0]")
Expand All @@ -26,7 +27,7 @@ def requirements(self):
self.requires("spdlog/1.13.0")
self.requires("nlohmann_json/3.11.3")
self.requires("cpr/1.10.5")
self.requires("xdaqmetadata/0.1.1")
self.requires("xdaqmetadata/0.1.2")
self.requires("openssl/3.4.1")
self.requires("cli11/2.5.0")

Expand Down
16 changes: 16 additions & 0 deletions export_release_debug.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
@REM Remove existing package from cache to ensure a fresh build
call conan remove -c "libxvc/*"

@REM Build and create Debug package
@REM add options to build depended library: --build=spdlog* --build=fmt*
call conan create . -pr:a default -s build_type=Debug -s compiler.runtime_type=Debug -b missing

@REM Build and create Release package
@REM add options to build depended library: --build=spdlog* --build=fmt*
call conan create . -pr:a default -s build_type=Release -s compiler.runtime_type=Release -b missing

echo.
echo Verifying packages in Conan cache:
call conan list libxvc/0.1.2:*
echo.
echo Build complete! Both Debug and Release packages are now in the Conan cache.
16 changes: 16 additions & 0 deletions scripts/export_release_debug.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
@REM Remove existing package from cache to ensure a fresh build
call conan remove -c "libxvc/*"

@REM Build and create Debug package
@REM add options to build depended library: --build=spdlog* --build=fmt*
call conan create . -pr:a default -s build_type=Debug -s compiler.runtime_type=Debug -b missing

@REM Build and create Release package
@REM add options to build depended library: --build=spdlog* --build=fmt*
call conan create . -pr:a default -s build_type=Release -s compiler.runtime_type=Release -b missing

echo.
echo Verifying packages in Conan cache:
call conan list libxvc/0.1.2:*
echo.
echo Build complete! Both Debug and Release packages are now in the Conan cache.
8 changes: 6 additions & 2 deletions xdaqvc/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,12 @@ target_compile_options(libxvc
)

if(CMAKE_BUILD_TYPE MATCHES "Debug")
target_compile_options(libxvc PUBLIC -fsanitize=address,undefined)
target_link_options(libxvc PUBLIC -fsanitize=address,undefined)
if(MSVC)
message(STATUS "MSVC Debug not set ASAN options")
else()
target_compile_options(libxvc PUBLIC -fsanitize=address,undefined)
target_link_options(libxvc PUBLIC -fsanitize=address,undefined)
endif()
endif()

target_link_libraries(libxvc
Expand Down
2 changes: 1 addition & 1 deletion xdaqvc/camera.cc
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ Camera *Camera::parse(const json &camera_json)
cap.fps_d = std::stoi(framerate_str.substr(delimiter_pos + 1));
}

if (cap.media_type != "image/jpeg") {
if (cap.media_type != "image/jpeg" && cap.media_type != "video/x-h265") {
continue;
}
camera->add_cap(cap);
Expand Down