Archives/v4l2rtspserver
2
0
Fork 0
mirror of https://github.com/mpromonet/v4l2rtspserver synced 2024-11-16 00:12:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/mpromonet/v4l2rtspserver into HEAD

Browse Source
This commit is contained in:
mpromonet 2022-09-18 15:56:58 +02:00
commit b03e11fd04
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@ -1,5 +1,5 @@
[submodule "v4l2wrapper"] [submodule "v4l2wrapper"]
path = v4l2wrapper path = libv4l2cpp
url = https://github.com/mpromonet/v4l2wrapper url = https://github.com/mpromonet/v4l2wrapper
[submodule "hls.js"] [submodule "hls.js"]
path = hls.js path = hls.js

8
CMakeLists.txt
View File

@ -111,11 +111,11 @@ if (ALSA)
endif () endif ()
endif() endif()
# v4l2wrapper # libv4l2cpp
EXEC_PROGRAM("git submodule update --init") EXEC_PROGRAM("git submodule update --init")
add_subdirectory(v4l2wrapper) add_subdirectory(libv4l2cpp EXCLUDE_FROM_ALL)
include_directories("v4l2wrapper/inc") include_directories("libv4l2cpp/inc")
target_link_libraries (${PROJECT_NAME} v4l2wrapper) target_link_libraries (${PROJECT_NAME} libv4l2cpp)
# static link of stdc++ if available # static link of stdc++ if available
include(CheckCXXCompilerFlag) include(CheckCXXCompilerFlag)

1
libv4l2cpp Submodule

@ -0,0 +1 @@
Subproject commit e06e49e2dd18082808a4f875993e722604487389

1
v4l2wrapper

@ -1 +0,0 @@
Subproject commit 941ba226415b63872787be4ff3fcf6c0945dee32