Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

release: 0.0.3 #10

Merged
merged 2 commits into from
Jan 21, 2025
Merged

release: 0.0.3 #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f01c6e2
fix: libvideoreader_c.so - help find libraries by specifying rpath
senyai Jan 21, 2025
f0525e1
release: 0.0.3
senyai Jan 21, 2025
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
13 changes: 13 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,19 @@ if (VIDEOREADER_BUILD_CAPI)
target_link_libraries(videoreader_c PRIVATE videoreader videowriter)

if (VIDEOREADER_CFFI)
if (WITH_FFMPEG)
set_property(TARGET videoreader_c APPEND PROPERTY INSTALL_RPATH "${ffmpeg_LINK_DIRECTORIES}")
endif()
if (WITH_IDATUM)
set_property(TARGET videoreader_c APPEND PROPERTY INSTALL_RPATH "${idatum_LINK_DIRECTORIES}")
endif()
if (WITH_PYLON)
set_property(TARGET videoreader_c APPEND PROPERTY INSTALL_RPATH "${pylon_LINK_DIRECTORIES}")
endif()
if (WITH_GALAXY)
set_property(TARGET videoreader_c APPEND PROPERTY INSTALL_RPATH "${galaxy_LINK_DIRECTORIES}")
endif()

if (PY_BUILD_CMAKE_IMPORT_NAME)
add_custom_command(
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/videoreader/_videoreader.py"
Expand Down
1 change: 1 addition & 0 deletions cmake/Findffmpeg.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ mark_as_advanced(
)

if(ffmpeg_FOUND AND NOT TARGET ffmpeg::avcodec)
get_filename_component(ffmpeg_LINK_DIRECTORIES "${AVUTIL_LIBRARY}" DIRECTORY)
add_library(ffmpeg::avutil UNKNOWN IMPORTED)
set_target_properties(ffmpeg::avutil PROPERTIES
IMPORTED_LOCATION "${AVUTIL_LIBRARY}"
Expand Down
9 changes: 5 additions & 4 deletions cmake/Findgalaxy.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,9 @@ find_package_handle_standard_args(
)

if(GALAXY_FOUND AND NOT TARGET galaxy)
add_library(galaxy UNKNOWN IMPORTED)
set_target_properties(galaxy PROPERTIES
IMPORTED_LOCATION "${GALAXY_GXI_LIBRARY}"
INTERFACE_INCLUDE_DIRECTORIES "${GALAXY_INCLUDE_DIR}")
get_filename_component(galaxy_LINK_DIRECTORIES "${GALAXY_GXI_LIBRARY}" DIRECTORY)
add_library(galaxy UNKNOWN IMPORTED)
set_target_properties(galaxy PROPERTIES
IMPORTED_LOCATION "${GALAXY_GXI_LIBRARY}"
INTERFACE_INCLUDE_DIRECTORIES "${GALAXY_INCLUDE_DIR}")
endif()
1 change: 1 addition & 0 deletions cmake/Findidatum.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ find_package_handle_standard_args(
)

if(IDATUM_FOUND AND NOT TARGET idatum)
get_filename_component(idatum_LINK_DIRECTORIES "${IDATUM_GCBase_LIBRARY}" DIRECTORY)
add_library(idatum::GCBase UNKNOWN IMPORTED)
set_target_properties(idatum::GCBase PROPERTIES
IMPORTED_LOCATION "${IDATUM_GCBase_LIBRARY}"
Expand Down
1 change: 1 addition & 0 deletions cmake/Findpylon.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ find_package_handle_standard_args(
)

if(pylon_FOUND AND NOT TARGET pylon::pylon_base)
get_filename_component(pylon_LINK_DIRECTORIES "${PYLON_BASE_LIBRARY}" DIRECTORY)
add_library(pylon::pylon_base UNKNOWN IMPORTED)
set_target_properties(pylon::pylon_base PROPERTIES
IMPORTED_LOCATION "${PYLON_BASE_LIBRARY}"
Expand Down
4 changes: 3 additions & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
[project]
name = "videoreader"
version = "0.0.2"
dynamic = ["version"]
authors = [
{ name="Arseniy Terekhin", email="senyai@gmail.com" },
]
license = {text = "MIT"}
readme = "README.md"
description = "Video capture library"
requires-python = ">=3.10"
classifiers = [
Expand Down
2 changes: 2 additions & 0 deletions python/videoreader/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
from ._videoreader import ffi
from pathlib import Path

__version__ = "0.0.3"


path = str(Path(__file__).parent / "libvideoreader_c.so")
try:
Expand Down