Merge branch 'main' into orca-flash-support

acquire-project · Jan 18, 2024 · ecccc56 · ecccc56
2 parents 71ec183 + 064b673
commit ecccc56
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 18 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -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
diff --git a/acquire-common b/acquire-common
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -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)

diff --git a/src/acquire-core-libs b/src/acquire-core-libs
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -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")
 
     #

diff --git a/tests/acquire-driver-common b/tests/acquire-driver-common
diff --git a/tests/acquire-video-runtime b/tests/acquire-video-runtime