From aeedd25cff52652592c1711c7fa16ca4b4cec7d4 Mon Sep 17 00:00:00 2001
From: Tim Wojtulewicz <tim@corelight.com>
Date: Mon, 12 Aug 2024 10:43:32 -0700
Subject: [PATCH] Add martinmoene/expected-lite as a submodule

---
 .gitmodules         |  3 +++
 CMakeLists.txt      | 15 +++++++++++++++
 auxil/expected-lite |  1 +
 3 files changed, 19 insertions(+)
 create mode 160000 auxil/expected-lite

diff --git a/.gitmodules b/.gitmodules
index 7736a3c40c..9eb32420d1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -82,3 +82,6 @@
 [submodule "src/cluster/websocket/auxil/IXWebSocket"]
 	path = src/cluster/websocket/auxil/IXWebSocket
 	url = https://github.com/zeek/IXWebSocket.git
+[submodule "auxil/expected-lite"]
+	path = auxil/expected-lite
+	url = https://github.com/martinmoene/expected-lite.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3635b54ed9..da8ad5a5f8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -343,6 +343,7 @@ add_zeek_dynamic_plugin_build_interface_include_directories(
     ${PROJECT_SOURCE_DIR}/auxil/broker/libbroker
     ${PROJECT_SOURCE_DIR}/auxil/paraglob/include
     ${PROJECT_SOURCE_DIR}/auxil/prometheus-cpp/core/include
+    ${PROJECT_SOURCE_DIR}/auxil/expected-lite/include
     ${CMAKE_BINARY_DIR}/src
     ${CMAKE_BINARY_DIR}/src/include
     ${CMAKE_BINARY_DIR}/auxil/binpac/lib
@@ -353,6 +354,10 @@ target_include_directories(
     zeek_dynamic_plugin_base SYSTEM
     INTERFACE $<INSTALL_INTERFACE:include/zeek/3rdparty/prometheus-cpp/include>)
 
+target_include_directories(
+    zeek_dynamic_plugin_base SYSTEM
+    INTERFACE $<INSTALL_INTERFACE:include/zeek/3rdparty/expected-lite/include>)
+
 # Convenience function for adding an OBJECT library that feeds directly into the
 # main target(s).
 #
@@ -1015,6 +1020,9 @@ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/auxil/prometheus-cpp/core/include/
 install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/auxil/prometheus-cpp/core/include/prometheus
         DESTINATION include/zeek/3rdparty/prometheus-cpp/include)
 
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/auxil/expected-lite/include/nonstd
+        DESTINATION include/zeek/3rdparty/)
+
 # Create 3rdparty/ghc within the build directory so that the include for
 # "zeek/3rdparty/ghc/filesystem.hpp" works within the build tree.
 execute_process(COMMAND "${CMAKE_COMMAND}" -E make_directory
@@ -1025,6 +1033,13 @@ execute_process(
         "${CMAKE_CURRENT_SOURCE_DIR}/auxil/filesystem/include/ghc"
         "${CMAKE_CURRENT_BINARY_DIR}/3rdparty/ghc")
 
+# Do the same for nonstd.
+execute_process(
+    COMMAND
+        "${CMAKE_COMMAND}" -E create_symlink
+        "${CMAKE_CURRENT_SOURCE_DIR}/auxil/expected-lite/include/nonstd"
+        "${CMAKE_CURRENT_BINARY_DIR}/3rdparty/nonstd")
+
 # Optional Dependencies
 
 set(USE_GEOIP false)
diff --git a/auxil/expected-lite b/auxil/expected-lite
new file mode 160000
index 0000000000..f339d2f737
--- /dev/null
+++ b/auxil/expected-lite
@@ -0,0 +1 @@
+Subproject commit f339d2f73730f8fee4412f5e4938717866ecef48