Added forgotten libz and libmagic include dirs to the search path.

This allows them to be located in a non-standard location.
This commit is contained in:
Jon Siwek 2010-10-21 15:43:22 -05:00
parent d043aba54d
commit bc1a25da37
2 changed files with 9 additions and 5 deletions

View file

@ -70,10 +70,6 @@ find_package(BISON REQUIRED)
find_package(PCAP REQUIRED) find_package(PCAP REQUIRED)
find_package(OpenSSL REQUIRED) find_package(OpenSSL REQUIRED)
find_package(BIND REQUIRED) find_package(BIND REQUIRED)
include_directories(BEFORE
${PCAP_INCLUDE_DIR}
${OPENSSL_INCLUDE_DIR}
${BIND_INCLUDE_DIR})
# This test is for when the user would like to use rebuild BinPAC # This test is for when the user would like to use rebuild BinPAC
# rather than use an existing installation # rather than use an existing installation
@ -107,6 +103,15 @@ endif ()
# TODO: optional libGeoIP # TODO: optional libGeoIP
# TODO: optional Google perftools # TODO: optional Google perftools
include_directories(BEFORE
${PCAP_INCLUDE_DIR}
${OPENSSL_INCLUDE_DIR}
${BIND_INCLUDE_DIR}
${BinPAC_INCLUDE_DIR}
${LibMagic_INCLUDE_DIR}
${ZLIB_INCLUDE_DIR}
)
## ##
## Configuration Checks/Tests ## Configuration Checks/Tests
## ##

View file

@ -1,6 +1,5 @@
include_directories(${CMAKE_CURRENT_SOURCE_DIR} include_directories(${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${BinPAC_INCLUDE_DIR}
) )
macro(REPLACE_YY_PREFIX_TARGET inFile outFile yylexPrefix yyPrefix) macro(REPLACE_YY_PREFIX_TARGET inFile outFile yylexPrefix yyPrefix)