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

Avoid linting headers in external paths

Browse source
This commit is contained in:
Tim Wojtulewicz 2025-06-08 21:59:50 -07:00
parent b1157e4e03
commit c07519353f
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CMakeLists.txt
View file

@ -1083,7 +1083,7 @@ set(USE_GEOIP false)
find_package(LibMMDB) find_package(LibMMDB)
if (LIBMMDB_FOUND) if (LIBMMDB_FOUND)
set(USE_GEOIP true) set(USE_GEOIP true)
include_directories(BEFORE ${LibMMDB_INCLUDE_DIR}) include_directories(BEFORE SYSTEM ${LibMMDB_INCLUDE_DIR})
list(APPEND OPTLIBS ${LibMMDB_LIBRARY}) list(APPEND OPTLIBS ${LibMMDB_LIBRARY})
endif () endif ()
@ -1091,7 +1091,7 @@ set(USE_KRB5 false)
find_package(LibKrb5) find_package(LibKrb5)
if (LIBKRB5_FOUND) if (LIBKRB5_FOUND)
set(USE_KRB5 true) set(USE_KRB5 true)
include_directories(BEFORE ${LibKrb5_INCLUDE_DIR}) include_directories(BEFORE SYSTEM ${LibKrb5_INCLUDE_DIR})
list(APPEND OPTLIBS ${LibKrb5_LIBRARY}) list(APPEND OPTLIBS ${LibKrb5_LIBRARY})
endif () endif ()
@ -1124,7 +1124,7 @@ endif ()
# dependencies which tend to be in standard system locations and thus cause the # dependencies which tend to be in standard system locations and thus cause the
# system OpenSSL headers to still be picked up even if one specifies # system OpenSSL headers to still be picked up even if one specifies
# --with-openssl (which may be common). # --with-openssl (which may be common).
include_directories(BEFORE ${OPENSSL_INCLUDE_DIR}) include_directories(BEFORE SYSTEM ${OPENSSL_INCLUDE_DIR})
# 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)

2
cmake

@ -1 +1 @@
Subproject commit 26f313a644e4430b0f2bd8dfbb1c992757ed84ae Subproject commit e2211bc960fcd2ff8c50d8649ed4eca0d4a9c35c

8
src/CMakeLists.txt
View file

@ -465,15 +465,15 @@ set(MAIN_SRCS
digest.h) digest.h)
set(THIRD_PARTY_SRCS set(THIRD_PARTY_SRCS
3rdparty/zeek_inet_ntop.c $<$<BOOL:USE_SQLITE>:3rdparty/sqlite3.c>
3rdparty/bsd-getopt-long.c
3rdparty/ConvertUTF.c 3rdparty/ConvertUTF.c
3rdparty/bsd-getopt-long.c
3rdparty/in_cksum.cc 3rdparty/in_cksum.cc
3rdparty/modp_numtoa.c 3rdparty/modp_numtoa.c
3rdparty/patricia.c 3rdparty/patricia.c
3rdparty/setsignal.c 3rdparty/setsignal.c
$<$<BOOL:USE_SQLITE>:3rdparty/sqlite3.c> 3rdparty/strsep.c
3rdparty/strsep.c) 3rdparty/zeek_inet_ntop.c)
if (USE_SQLITE AND WNOERROR_FLAG) if (USE_SQLITE AND WNOERROR_FLAG)
set_source_files_properties(3rdparty/sqlite3.c PROPERTIES COMPILE_FLAGS ${WNOERROR_FLAG}) set_source_files_properties(3rdparty/sqlite3.c PROPERTIES COMPILE_FLAGS ${WNOERROR_FLAG})