From: Josh <jrosenba@cisco.com>
Date: Wed, 7 May 2014 15:53:58 +0000 (-0400)
Subject: tweaking CMake files after merge
X-Git-Tag: 3.0.0-233~1526^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=66bbdfe396dd012a3b551f48823762f3cc03e83f;p=thirdparty%2Fsnort3.git

tweaking CMake files after merge
---

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9603a1615..f8b5417a4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -59,6 +59,7 @@ target_link_libraries(snort
     perf_monitor
     stream
     http_inspect
+    nhttp_inspect
     flow
     parser
     file_api
diff --git a/src/file_api/CMakeLists.txt b/src/file_api/CMakeLists.txt
index 3da1a7b60..cbf721168 100644
--- a/src/file_api/CMakeLists.txt
+++ b/src/file_api/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-add_subdirectory("libs")
+add_subdirectory(libs)
 
 add_library ( file_api STATIC
     file_api.h 
diff --git a/src/service_inspectors/CMakeLists.txt b/src/service_inspectors/CMakeLists.txt
index 90da5c640..147e7b630 100644
--- a/src/service_inspectors/CMakeLists.txt
+++ b/src/service_inspectors/CMakeLists.txt
@@ -2,6 +2,7 @@
 add_subdirectory(back_orifice)
 add_subdirectory(ftp_telnet)
 add_subdirectory(http_inspect)
+add_subdirectory(nhttp_inspect)
 add_subdirectory(rpc_decode)
 
 add_library( service_inspectors STATIC
@@ -13,5 +14,6 @@ target_link_libraries( service_inspectors
     back_orifice
     ftp_telnet
     http_inspect
+    nhttp_inspect
     rpc_decode
 )
diff --git a/src/service_inspectors/nhttp_inspect/CMakeLists.txt b/src/service_inspectors/nhttp_inspect/CMakeLists.txt
new file mode 100644
index 000000000..3c62e9bca
--- /dev/null
+++ b/src/service_inspectors/nhttp_inspect/CMakeLists.txt
@@ -0,0 +1,28 @@
+
+set (FILE_LIST
+    nhttp_inspect.cc
+    nhttp_inspect.h
+    nhttp_msgheader.cc
+    nhttp_msgheader.h
+    nhttp_headnorm.cc
+    nhttp_headnorm.h
+    nhttp_strtocode.cc
+    nhttp_strtocode.h
+    nhttp_api.cc
+    nhttp_api.h
+    nhttp_tables.cc
+    nhttp_module.cc
+    nhttp_module.h
+    nhttp_testinput.cc
+    nhttp_testinput.h
+    nhttp_flowdata.cc
+    nhttp_flowdata.h
+    nhttp_scratchpad.h
+    nhttp_enum.h
+)
+
+#if (STATIC_INSPECTORS)
+    add_library(nhttp_inspect STATIC ${FILE_LIST})
+#else()
+#    add_shared_library(nhttp_inspect inspectors ${FILE_LIST})
+#endif()