ipmatcher rule_id -> long long & scanner engine centralization

4 files changed, 1 insertions, 43 deletions

diff --git a/vendor/CMakeLists.txt b/vendor/CMakeLists.txt
index 045de09..c29d99d 100644
--- a/vendor/CMakeLists.txt
+++ b/vendor/CMakeLists.txt
@@ -58,22 +58,6 @@ add_dependencies(hyperscan_runtime_static hyperscan)
 set_property(TARGET hyperscan_runtime_static PROPERTY IMPORTED_LOCATION ${VENDOR_BUILD}/lib64/libhs_runtime.a)
 set_property(TARGET hyperscan_runtime_static PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${VENDOR_BUILD}/include)
 
-# ipmatcher-1.1
-ExternalProject_Add(ipmatcher PREFIX ipmatcher
-        URL ${CMAKE_CURRENT_SOURCE_DIR}/ipmatcher-v1.1.zip
-		CONFIGURE_COMMAND ""
-        BUILD_COMMAND make
-		INSTALL_COMMAND make DESTDIR=<INSTALL_DIR> install
-        BUILD_IN_SOURCE 1)
-
-ExternalProject_Get_Property(ipmatcher INSTALL_DIR)
-file(MAKE_DIRECTORY ${INSTALL_DIR}/include)
-
-add_library(ipmatcher-static STATIC IMPORTED GLOBAL)
-add_dependencies(ipmatcher-static ipmatcher)
-set_property(TARGET ipmatcher-static PROPERTY IMPORTED_LOCATION ${INSTALL_DIR}/lib/ipmatcher.a)
-set_property(TARGET ipmatcher-static PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include)
-
 # hiredis-1.1.0
 ExternalProject_Add(hiredis PREFIX hiredis
         URL ${CMAKE_CURRENT_SOURCE_DIR}/hiredis-1.1.0.tar.gz
@@ -107,30 +91,4 @@ file(MAKE_DIRECTORY ${INSTALL_DIR}/include)
 add_library(igraph-static STATIC IMPORTED GLOBAL)
 add_dependencies(igraph-static igraph)
 set_property(TARGET igraph-static PROPERTY IMPORTED_LOCATION ${INSTALL_DIR}/lib/libigraph.a)
-set_property(TARGET igraph-static PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include)
-
-#flag-matcher
-ExternalProject_Add(flagmatcher PREFIX flagmatcher
-        URL ${CMAKE_CURRENT_SOURCE_DIR}/flag-matcher-1.0.1.tar.gz
-		CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${VENDOR_BUILD} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_C_FLAGS="-fPIC")
-
-ExternalProject_Get_Property(flagmatcher INSTALL_DIR)
-file(MAKE_DIRECTORY ${VENDOR_BUILD}/include)
-
-add_library(flagmatcher-static STATIC IMPORTED GLOBAL)
-add_dependencies(flagmatcher-static flagmatcher)
-set_property(TARGET flagmatcher-static  PROPERTY IMPORTED_LOCATION ${VENDOR_BUILD}/lib/libflag_matcher.a)
-set_property(TARGET flagmatcher-static  PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${VENDOR_BUILD}/include)
-
-#interval-matcher
-ExternalProject_Add(intervalmatcher PREFIX intervalmatcher
-        URL ${CMAKE_CURRENT_SOURCE_DIR}/interval-matcher-1.0.1.tar.gz
-		CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${VENDOR_BUILD} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_C_FLAGS="-fPIC")
-
-ExternalProject_Get_Property(intervalmatcher INSTALL_DIR)
-file(MAKE_DIRECTORY ${VENDOR_BUILD}/include)
-
-add_library(intervalmatcher-static STATIC IMPORTED GLOBAL)
-add_dependencies(intervalmatcher-static flagmatcher)
-set_property(TARGET intervalmatcher-static  PROPERTY IMPORTED_LOCATION ${VENDOR_BUILD}/lib/libinterval_matcher.a)
-set_property(TARGET intervalmatcher-static  PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${VENDOR_BUILD}/include)
+set_property(TARGET igraph-static PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include)
\ No newline at end of file
diff --git a/vendor/flag-matcher-1.0.1.tar.gz b/vendor/flag-matcher-1.0.1.tar.gz
deleted file mode 100644
index 1cfab0e..0000000
--- a/vendor/flag-matcher-1.0.1.tar.gz
+++ /dev/null
diff --git a/vendor/interval-matcher-1.0.1.tar.gz b/vendor/interval-matcher-1.0.1.tar.gz
deleted file mode 100644
index 4f8a88f..0000000
--- a/vendor/interval-matcher-1.0.1.tar.gz
+++ /dev/null
diff --git a/vendor/ipmatcher-v1.1.zip b/vendor/ipmatcher-v1.1.zip
deleted file mode 100644
index 48fe8e2..0000000
--- a/vendor/ipmatcher-v1.1.zip
+++ /dev/null