diff --git a/.gitmodules b/.gitmodules index 311f406..8500ce1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,5 +1,5 @@ [submodule "v4l2wrapper"] - path = v4l2wrapper + path = libv4l2cpp url = https://github.com/mpromonet/v4l2wrapper [submodule "hls.js"] path = hls.js diff --git a/CMakeLists.txt b/CMakeLists.txt index c14b51e..472a7ec 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -111,11 +111,11 @@ if (ALSA) endif () endif() -# v4l2wrapper +# libv4l2cpp EXEC_PROGRAM("git submodule update --init") -add_subdirectory(v4l2wrapper) -include_directories("v4l2wrapper/inc") -target_link_libraries (${PROJECT_NAME} v4l2wrapper) +add_subdirectory(libv4l2cpp EXCLUDE_FROM_ALL) +include_directories("libv4l2cpp/inc") +target_link_libraries (${PROJECT_NAME} libv4l2cpp) # static link of stdc++ if available include(CheckCXXCompilerFlag) diff --git a/libv4l2cpp b/libv4l2cpp new file mode 160000 index 0000000..e06e49e --- /dev/null +++ b/libv4l2cpp @@ -0,0 +1 @@ +Subproject commit e06e49e2dd18082808a4f875993e722604487389 diff --git a/v4l2wrapper b/v4l2wrapper deleted file mode 160000 index 941ba22..0000000 --- a/v4l2wrapper +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 941ba226415b63872787be4ff3fcf6c0945dee32