Merge pull request #212 in SNORT/snort3 from fix_cmake_host_tracker to master

Squashed commit of the following:

commit 25bc4c6b2af46cf8a5d995bc3f6a531390915f93
Author: Steve Chew <stechew@cisco.com>
Date:   Thu Jan 21 15:38:28 2016 -0500

    Fix to allow cmake to work with new host_tracker location.

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6a38a59bedfddb837822dcac5c9d99b862610188..b1bce75cd4d19a6606b2f291d8379220cda9c2f3 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -121,6 +121,7 @@ target_link_libraries( snort
     search_engines
     target_based
     main
+    host_tracker
     parser
     flow
     control
@@ -169,6 +170,7 @@ add_subdirectory(sfrt)
 add_subdirectory(service_inspectors)
 add_subdirectory(stream)
 add_subdirectory(target_based)
+add_subdirectory(host_tracker)
 add_subdirectory(time)
 add_subdirectory(profiler)
 add_subdirectory(utils)

diff --git a/src/target_based/CMakeLists.txt b/src/target_based/CMakeLists.txt
index e8fcddf8a6c90577194b31c25468b62022d54dcb..40ec021411d590f8ad3e172172cd6a84352cc32c 100644 (file)
--- a/src/target_based/CMakeLists.txt
+++ b/src/target_based/CMakeLists.txt
@@ -7,5 +7,4 @@ add_library( target_based STATIC
     sftarget_data.h
     snort_protocols.cc
     snort_protocols.h
-    host_tracker.h
 )