From: Josh Date: Thu, 20 Nov 2014 00:12:07 +0000 (-0600) Subject: pulling in Russ's changes X-Git-Tag: 3.0.0-233~1188 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=05b62f0668a2589384170bc4c1bedcdaba95643d;p=thirdparty%2Fsnort3.git pulling in Russ's changes --- diff --git a/cmake/FindDNET.cmake b/cmake/FindDNET.cmake index 73ac92ae7..e0a31ef2c 100644 --- a/cmake/FindDNET.cmake +++ b/cmake/FindDNET.cmake @@ -29,8 +29,11 @@ find_path(DNET_INCLUDE_DIR HINTS ENV DNETDIR ) -# Define HAVE_DUMBNET_H for config.h generation if we found libdumnet headers. -set_if_true(DNET_INCLUDE_DIR HAVE_DUMBNET_H) +# If we found libdument header, define HAVE_DUMBNET_H for config.h generation. +if (DNET_INCLUDE_DIR) + set(HAVE_DUMBNET_H "YES") +endif() + # Search for library twice. The first time using the custom path, second time # using standard paths @@ -50,11 +53,9 @@ find_path(DNET_INCLUDE_DIR HINTS ENV DNETDIR ) -# Search for library twice. The first time using the custom path, second time -# using standard paths find_library(DNET_LIBRARIES NAMES dnet - HINTS ${DNET_LIBRARIES_DIR} # user specified option in ./configure_cmake.sh + HINTS ${DNET_LIBRARIES_DIR} NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH )