From: Josh <jrosenba@cisco.com>
Date: Mon, 6 Oct 2014 23:04:10 +0000 (-0500)
Subject: partially updating extra cmake
X-Git-Tag: 3.0.0-233~1383^2~35^2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3efb779bdcf37e9f8ed14e08aa04b1fd3f6d4581;p=thirdparty%2Fsnort3.git

partially updating extra cmake
---

diff --git a/extra/CMakeLists.txt b/extra/CMakeLists.txt
index 9357abd67..f17d9a318 100644
--- a/extra/CMakeLists.txt
+++ b/extra/CMakeLists.txt
@@ -12,21 +12,17 @@ else (BUILD_EXTRA_PLUGINS)
     set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}")
 
     # Look for Snort using pkg-config and our own find-snort module
-    find_package(PkgConfig REQUIRED)
-    pkg_check_modules(SNORT_PKG_MODULE snort)
 
     if (APPLE)
         set(CMAKE_MACOSX_RPATH OFF)
     endif(APPLE)
 
-    if (SNORT_PKG_MODULE_FOUND)
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SNORT_PKG_MODULE_CFLAGS}")
-        find_package(SNORT QUIET)
-    else()
-        find_package(SNORT REQUIRED)
-    endif()
+    find_package(SNORT REQUIRED)
+
+
 
     if ((NOT SNORT_FOUND) AND (NOT SNORT_PKG_MODULE_FOUND))
+        find_package(SNORT REQUIRED) # to print the helpful Snort message
         message(FATAL_ERROR "Unable to find Snort includes!!")
     endif()
 
diff --git a/extra/FindSNORT.cmake b/extra/FindSNORT.cmake
index 99c17ca09..8d7a38140 100644
--- a/extra/FindSNORT.cmake
+++ b/extra/FindSNORT.cmake
@@ -4,11 +4,9 @@
 #  This module defines
 #  DAQ_FOUND, if false, do not try to link to Lua
 # 
-#  SNORT_FOUND - system has the daq
-#  SNORT_INCLUDE_DIR - the daqs include directory
+#  SNORT_FOUND - Found Snort
+#  SNORT_INCLUDE_DIR - Snort include directory
 #
-## Copied from default CMake FindLua51.cmake
-
 
 set(ERROR_MESSAGE
     "
@@ -21,6 +19,9 @@ set(ERROR_MESSAGE
 
     3)  set the environment variable SNORT_DIR
 
+    4)  install pkg-config and add snort.pc to the PKG_CONFIG_PATH
+            environment variable.
+
     "
 )
 
@@ -28,9 +29,25 @@ set(ERROR_MESSAGE
 find_path (SNORT_INCLUDE_DIR
     NAMES main/snort_types.h
     HINTS ENV SNORT_DIR
-    PATH_SUFFIXES snort
+    PATH_SUFFIXES snort include/snort
 )
 
+if (NOT SNORT_INCLUDE_DIR)
+    find_package(PkgConfig QUIET)
+
+    if (PKG_CONFIG_FOUND)
+        pkg_check_modules(SNORT_PKG_MODULE snort)
+        message(STATUS "snort_FOUND == ${snort_FOUND}")
+        message(STATUS "SNORT_PKG_MODULE_FOUND == ${SNORT_PKG_MODULE_FOUND}")
+
+        if (SNORT_PKG_MODULE_FOUND)
+            set(SNORT_INCLUDE_DIR "${SNORT_PKG_MODULE_INCLUDE_DIRS}")
+        endif (SNORT_PKG_MODULE_FOUND)
+
+        message(STATUS "snort include dirs ${SNORT_PKG_MODULE_INCLUDE_DIRS}")
+    endif (PKG_CONFIG_FOUND)
+endif (NOT SNORT_INCLUDE_DIR)
+
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(SNORT
diff --git a/extra/src/codecs/pim.cc b/extra/src/codecs/pim.cc
index b95f69ccb..0ec187b77 100644
--- a/extra/src/codecs/pim.cc
+++ b/extra/src/codecs/pim.cc
@@ -26,6 +26,7 @@
 #endif
 
 #include "framework/codec.h"
+#include "framework/decode_data.h"
 #include "codecs/codec_events.h"
 
 
@@ -57,7 +58,6 @@ void PimCodec::get_protocol_ids(std::vector<uint16_t>& v)
 {
     v.push_back(IPPROTO_ID_PIM);
 }
-
 bool PimCodec::decode(const RawData&, CodecData& codec, DecodeData&)
 {
     codec_events::decoder_event(codec, DECODE_IP_BAD_PROTO);
diff --git a/src/framework/codec.h b/src/framework/codec.h
index bf8a8a7c3..4ddd7fcf7 100644
--- a/src/framework/codec.h
+++ b/src/framework/codec.h
@@ -407,5 +407,5 @@ struct CodecApi
     CdDelFunc dtor;   // clean up instance data
 };
 
-#endif
+#endif /* FRAMEWORK_CODEC_H */