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.

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

Switch out three submodules for one #188

Merged
merged 2 commits into from
Jan 3, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
15 changes: 3 additions & 12 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,12 +1,3 @@
[submodule "tests/acquire-video-runtime"]
path = tests/acquire-video-runtime
url = ../acquire-video-runtime.git
branch = main
[submodule "tests/acquire-driver-common"]
path = tests/acquire-driver-common
url = ../acquire-driver-common.git
branch = main
[submodule "src/acquire-core-libs"]
path = src/acquire-core-libs
url = ../acquire-core-libs.git
branch = main
[submodule "acquire-common"]
path = acquire-common
url = ../acquire-common.git
1 change: 1 addition & 0 deletions acquire-common
Submodule acquire-common added at ba689e
2 changes: 1 addition & 1 deletion src/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
if (NOT TARGET acquire-core-libs)
add_subdirectory(acquire-core-libs)
add_subdirectory(../acquire-common/acquire-core-libs ${CMAKE_CURRENT_BINARY_DIR}/acquire-core-libs)
endif ()

set(tgt acquire-driver-hdcam)
Expand Down
1 change: 0 additions & 1 deletion src/acquire-core-libs
Submodule acquire-core-libs deleted from f2dd74
4 changes: 2 additions & 2 deletions tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ if(${NOTEST})
message(STATUS "Skipping test targets")
else()
set(NOTEST "TRUE")
aq_require(acquire-video-runtime)
aq_require(acquire-driver-common)
add_subdirectory(../acquire-common/acquire-driver-common ${CMAKE_CURRENT_BINARY_DIR}/acquire-driver-common)
add_subdirectory(../acquire-common/acquire-video-runtime ${CMAKE_CURRENT_BINARY_DIR}/acquire-video-runtime)
set(NOTEST "FALSE")

#
Expand Down
1 change: 0 additions & 1 deletion tests/acquire-driver-common
Submodule acquire-driver-common deleted from 7308ef
1 change: 0 additions & 1 deletion tests/acquire-video-runtime
Submodule acquire-video-runtime deleted from a63a29
Loading