From: Masud Hasan (mashasan) <mashasan@cisco.com>
Date: Fri, 1 May 2020 19:40:14 +0000 (+0000)
Subject: Merge pull request #2186 in SNORT/snort3 from ~RUTIAN/snort3:stash_captive_portal... 
X-Git-Tag: 3.0.1-3~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b3dc8d7541cc15cc79bc956a69d96c4a6015918;p=thirdparty%2Fsnort3.git

Merge pull request #2186 in SNORT/snort3 from ~RUTIAN/snort3:stash_captive_portal to master

Squashed commit of the following:

commit 3be74831ae44aba42fbe37601511fc501d456ddc
Author: Ruiqi Tian <rutian@cisco.com>
Date:   Tue Apr 28 21:11:02 2020 -0400

    memory: expose memory_cap.h to plugins
---

diff --git a/src/memory/CMakeLists.txt b/src/memory/CMakeLists.txt
index 182861556..3b60f8142 100644
--- a/src/memory/CMakeLists.txt
+++ b/src/memory/CMakeLists.txt
@@ -1,6 +1,10 @@
+set (MEMCAP_INCLUDES
+    memory_cap.h
+)
+
 set ( MEMORY_SOURCES
+    ${MEMCAP_INCLUDES}
     memory_cap.cc
-    memory_cap.h
     memory_module.cc
     memory_module.h
     memory_config.h
@@ -11,3 +15,7 @@ set ( MEMORY_SOURCES
 add_library ( memory OBJECT
     ${MEMORY_SOURCES}
 )
+
+install(FILES ${MEMCAP_INCLUDES}
+    DESTINATION "${INCLUDE_INSTALL_PATH}/memory/"
+)
diff --git a/src/memory/memory_cap.h b/src/memory/memory_cap.h
index 450f3322f..116ce8d55 100644
--- a/src/memory/memory_cap.h
+++ b/src/memory/memory_cap.h
@@ -28,7 +28,7 @@
 namespace memory
 {
 
-class MemoryCap
+class SO_PUBLIC MemoryCap
 {
 public:
     static bool free_space(size_t);