Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 06:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

GH-960: Fix include order of bundled header files

Browse source 
Previously, a system-wide installation of any bundled auxil/ software
(like CAF) may get found/included rather than the bundled version and
possibly break the build.
This commit is contained in:
Jon Siwek 2021-03-26 16:26:49 -07:00
parent 9ff3abb72c
commit 444fd8ff43
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
CMakeLists.txt
View file

@ -376,9 +376,6 @@ endif ()
# we have to care about CAF here because Broker headers can pull in CAF # we have to care about CAF here because Broker headers can pull in CAF
# headers. # headers.
set(zeekdeps ${zeekdeps} ${CAF_LIBRARIES}) set(zeekdeps ${zeekdeps} ${CAF_LIBRARIES})
include_directories(BEFORE ${broker_includes} ${CAF_INCLUDE_DIRS})
include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/auxil/paraglob/include)
include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/auxil/rapidjson/include)
include_directories(BEFORE include_directories(BEFORE
${PCAP_INCLUDE_DIR} ${PCAP_INCLUDE_DIR}
${BIND_INCLUDE_DIR} ${BIND_INCLUDE_DIR}
@ -441,9 +438,6 @@ endif ()
# if one specifies --with-openssl (which may be common). # if one specifies --with-openssl (which may be common).
include_directories(BEFORE ${OPENSSL_INCLUDE_DIR}) include_directories(BEFORE ${OPENSSL_INCLUDE_DIR})
# Make everyone find the highwayhash includes
include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/auxil/highwayhash)
# Determine if libfts is external to libc, i.e. musl # Determine if libfts is external to libc, i.e. musl
find_package(FTS) find_package(FTS)
if ( FTS_FOUND ) if ( FTS_FOUND )
@ -451,6 +445,14 @@ if ( FTS_FOUND )
include_directories(BEFORE ${FTS_INCLUDE_DIR}) include_directories(BEFORE ${FTS_INCLUDE_DIR})
endif () endif ()
# Any headers that are possibly bundled in the Zeek source-tree and that are supposed
# to have priority over any pre-existing/system-wide headers need to appear early in
# compiler search path.
include_directories(BEFORE ${broker_includes} ${CAF_INCLUDE_DIRS})
include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/auxil/highwayhash)
include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/auxil/paraglob/include)
include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/auxil/rapidjson/include)
set(zeekdeps ${zeekdeps} set(zeekdeps ${zeekdeps}
${BinPAC_LIBRARY} ${BinPAC_LIBRARY}
${PCAP_LIBRARY} ${PCAP_LIBRARY}