From c07519353f763533f4a84eb46420d2e7f2b4dcb1 Mon Sep 17 00:00:00 2001 From: Tim Wojtulewicz Date: Sun, 8 Jun 2025 21:59:50 -0700 Subject: [PATCH] Avoid linting headers in external paths --- CMakeLists.txt | 6 +++--- cmake | 2 +- src/CMakeLists.txt | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2dc52d478f..05ad9d0caa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1083,7 +1083,7 @@ set(USE_GEOIP false) find_package(LibMMDB) if (LIBMMDB_FOUND) set(USE_GEOIP true) - include_directories(BEFORE ${LibMMDB_INCLUDE_DIR}) + include_directories(BEFORE SYSTEM ${LibMMDB_INCLUDE_DIR}) list(APPEND OPTLIBS ${LibMMDB_LIBRARY}) endif () @@ -1091,7 +1091,7 @@ set(USE_KRB5 false) find_package(LibKrb5) if (LIBKRB5_FOUND) set(USE_KRB5 true) - include_directories(BEFORE ${LibKrb5_INCLUDE_DIR}) + include_directories(BEFORE SYSTEM ${LibKrb5_INCLUDE_DIR}) list(APPEND OPTLIBS ${LibKrb5_LIBRARY}) endif () @@ -1124,7 +1124,7 @@ endif () # 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 # --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 find_package(FTS) diff --git a/cmake b/cmake index 26f313a644..e2211bc960 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 26f313a644e4430b0f2bd8dfbb1c992757ed84ae +Subproject commit e2211bc960fcd2ff8c50d8649ed4eca0d4a9c35c diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f8c5a42f51..31ae4fd073 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -465,15 +465,15 @@ set(MAIN_SRCS digest.h) set(THIRD_PARTY_SRCS - 3rdparty/zeek_inet_ntop.c - 3rdparty/bsd-getopt-long.c + $<$:3rdparty/sqlite3.c> 3rdparty/ConvertUTF.c + 3rdparty/bsd-getopt-long.c 3rdparty/in_cksum.cc 3rdparty/modp_numtoa.c 3rdparty/patricia.c 3rdparty/setsignal.c - $<$:3rdparty/sqlite3.c> - 3rdparty/strsep.c) + 3rdparty/strsep.c + 3rdparty/zeek_inet_ntop.c) if (USE_SQLITE AND WNOERROR_FLAG) set_source_files_properties(3rdparty/sqlite3.c PROPERTIES COMPILE_FLAGS ${WNOERROR_FLAG})