From 78380de22299f429feb7a7a1b407463cf7807467 Mon Sep 17 00:00:00 2001
From: Alan Liddell <aliddell@chanzuckerberg.com>
Date: Wed, 3 Jan 2024 16:51:12 -0500
Subject: [PATCH] Switch out three submodules for one (#220)

---
 .gitmodules                 | 15 +++------------
 acquire-common              |  1 +
 src/CMakeLists.txt          |  2 +-
 src/acquire-core-libs       |  1 -
 tests/CMakeLists.txt        |  4 ++--
 tests/acquire-driver-common |  1 -
 tests/acquire-video-runtime |  1 -
 7 files changed, 7 insertions(+), 18 deletions(-)
 create mode 160000 acquire-common
 delete mode 160000 src/acquire-core-libs
 delete mode 160000 tests/acquire-driver-common
 delete mode 160000 tests/acquire-video-runtime

diff --git a/.gitmodules b/.gitmodules
index 7da3a760..7a9f6004 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,12 +1,3 @@
-[submodule "tests/acquire-video-runtime"]
-	path = tests/acquire-video-runtime
-	url = ../acquire-video-runtime/
-	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
new file mode 160000
index 00000000..ba689edb
--- /dev/null
+++ b/acquire-common
@@ -0,0 +1 @@
+Subproject commit ba689edb5632e397a95d8d100934b7326ab46814
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bcb6c7d7..4f2faf83 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,7 +1,7 @@
 add_subdirectory(3rdParty)
 
 if (NOT TARGET acquire-core-logger)
-    add_subdirectory(acquire-core-libs)
+    add_subdirectory(../acquire-common/acquire-core-libs ${CMAKE_CURRENT_BINARY_DIR}/acquire-core-libs)
 endif ()
 
 set(tgt acquire-driver-zarr)
diff --git a/src/acquire-core-libs b/src/acquire-core-libs
deleted file mode 160000
index f2dd7475..00000000
--- a/src/acquire-core-libs
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f2dd7475b1e2667e0682baf4034b1a4c07196ac9
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 33c146e8..eb8f1992 100644
--- 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-driver-common)
-    aq_require(acquire-video-runtime)
+    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
deleted file mode 160000
index 7308ef5f..00000000
--- a/tests/acquire-driver-common
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7308ef5f450532af2052e15ef63252f6de8064bf
diff --git a/tests/acquire-video-runtime b/tests/acquire-video-runtime
deleted file mode 160000
index a63a29e9..00000000
--- a/tests/acquire-video-runtime
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a63a29e93ec18784e881616f2198b8d8307a8d39