From: Josh <jrosenba@cisco.com>
Date: Tue, 7 Oct 2014 17:17:25 +0000 (-0500)
Subject: minor cmake update
X-Git-Tag: 3.0.0-233~1383^2~33^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=065de0ca24f8d2a63ee628ee8ec01592d037e015;p=thirdparty%2Fsnort3.git

minor cmake update
---

diff --git a/cmake/FindDAQ.cmake b/cmake/FindDAQ.cmake
index 535877584..e485f8477 100644
--- a/cmake/FindDAQ.cmake
+++ b/cmake/FindDAQ.cmake
@@ -23,8 +23,8 @@ set (ERROR_MESSAGE
 
 
 find_path(DAQ_INCLUDE_DIR
-    NAMES  daq.h 
-    HINTS  ENV DAQ_DIR
+    NAMES daq.h
+    HINTS ENV DAQ_DIR
     PATH_SUFFIXES daq
 )
 
diff --git a/extra/FindSNORT.cmake b/extra/FindSNORT.cmake
index 5f6ba8ad8..8910dd49b 100644
--- a/extra/FindSNORT.cmake
+++ b/extra/FindSNORT.cmake
@@ -29,6 +29,7 @@ set(ERROR_MESSAGE
 find_path (SNORT_INCLUDE_DIR
     NAMES main/snort_types.h
     HINTS ENV SNORT_DIR
+    PATH_SUFFIXES snort include/snort
 )
 
 if (NOT SNORT_INCLUDE_DIR)
@@ -43,7 +44,6 @@ if (NOT SNORT_INCLUDE_DIR)
     endif (PKG_CONFIG_FOUND)
 endif (NOT SNORT_INCLUDE_DIR)
 
-
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(SNORT
     REQUIRED_VARS SNORT_INCLUDE_DIR
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e1e78c955..cffb22fed 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,12 +2,12 @@
 
 # keeping track of external libraries seperately for use in pkg-config.
 set(EXTERNAL_LIBRARIES
+    ${LUAJIT_LIBRARIES}
     ${PCRE_LIBRARIES}
     ${PCAP_LIBRARIES}
     ${OPENSSL_LIBRARIES}
     ${ZLIB_LIBRARIES}
 #    ${OPENSSL_CRYPTO_LIBRARY}  -- part of OPENSSL_LIBRARIES
-    ${LUAJIT_LIBRARIES}
     ${DAQ_LIBRARIES}
     ${DNET_LIBRARIES}
     ${CLANG_CXX_LIBRARY}
@@ -25,7 +25,7 @@ set(EXTERNAL_INCLUDES
     ${ZLIB_INCLUDE_DIRS}
     CACHE INTERNAL "external INCLUDES" FORCE
 )
-include_directories(${EXTERNAL_INCLUDES})
+include_directories(BEFORE SYSTEM ${EXTERNAL_INCLUDES})
 
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})