Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions BifCl.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,6 @@ macro (bif_target bifInput)
file(APPEND "${CMAKE_BINARY_DIR}/scripts/base/bif/__load__.zeek"
"@load ./${bifInputBasename}.zeek\n")

# Do this here so that all of the necessary files for each individual BIF get added to clang-tidy
add_clang_tidy_files(${CMAKE_CURRENT_BINARY_DIR}/${bifInputBasename}.func_def)

elseif ("${ARGV1}" STREQUAL "plugin")
set(plugin_name ${ARGV2})
set(plugin_name_canon ${ARGV3})
Expand All @@ -69,11 +66,6 @@ macro (bif_target bifInput)
${CMAKE_CURRENT_BINARY_DIR}/${bifInputBasename}.register.cc)
endif ()

# Do this here so that all of the necessary files for each individual BIF get added to clang-tidy
foreach (bif_cc_file ${BIF_OUTPUT_CC})
add_clang_tidy_files(${CMAKE_CURRENT_BINARY_DIR}/${bif_cc_file})
endforeach (bif_cc_file)

set(BIF_OUTPUT_H ${CMAKE_CURRENT_BINARY_DIR}/${bifInputBasename}.h)

if (NOT ZEEK_PLUGIN_BUILD_DYNAMIC)
Expand All @@ -95,11 +87,6 @@ macro (bif_target bifInput)
set(BIF_OUTPUT_CC ${bifInputBasename}.cc)
set(BIF_OUTPUT_H ${bifInputBasename}.h)

# Do this here so that all of the necessary files for each individual BIF get added to clang-tidy
foreach (bif_cc_file ${BIF_OUTPUT_CC})
add_clang_tidy_files(${CMAKE_CURRENT_BINARY_DIR}/${bif_cc_file})
endforeach (bif_cc_file)

# In order be able to run Zeek from the build directory, the
# generated Zeek script needs to be inside a directory tree
# named the same way it will be referenced from an @load.
Expand Down
2 changes: 0 additions & 2 deletions BinPAC.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,6 @@ function (binpac_target pacFile)
"-Wno-tautological-compare")
endif ()

add_clang_tidy_files(${CMAKE_CURRENT_BINARY_DIR}/${basename}_pac.cc)

set(target "pac-${CMAKE_CURRENT_BINARY_DIR}/${pacFile}")

# Make sure to escape a bunch of special characters in the path before trying to use it as a
Expand Down
58 changes: 0 additions & 58 deletions FindClangTidy.cmake

This file was deleted.

1 change: 0 additions & 1 deletion ZeekPluginDynamic.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
include(FindClangTidy)
include(GetArchitecture)

# Sets `target` to contain the CMake target name for a dynamic plugin.
Expand Down
8 changes: 4 additions & 4 deletions ZeekPluginStatic.cmake
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
include(BifCl)
include(BinPAC)
include(FindClangTidy)

# Sets `target` to contain the CMake target name for a static plugin.
macro (zeek_get_static_plugin_target target ns name)
Expand Down Expand Up @@ -87,7 +86,6 @@ function (zeek_add_static_plugin ns name)
# Add the sources for the plugin.
if (FN_ARGS_SOURCES)
target_sources(${target_name} PRIVATE ${FN_ARGS_SOURCES})
add_clang_tidy_files(${FN_ARGS_SOURCES})
endif ()

# Setup for the load/preload scripts.
Expand Down Expand Up @@ -124,6 +122,8 @@ function (zeek_add_static_plugin ns name)
# Feed into the main Zeek target(s).
zeek_target_link_libraries(${target_name})

# Add IWYU and clang-tidy to the target if enabled.
zeek_target_add_linters(${target_name})
if (NOT ZEEK_BUILDING_EXTRA_PLUGINS)
# Add IWYU and clang-tidy to the target if enabled.
zeek_target_add_linters(${target_name})
endif ()
endfunction ()
1 change: 0 additions & 1 deletion ZeekSubdir.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,4 @@ function (bro_add_subdir_library name)
set(bro_SUBDIR_LIBS "$<TARGET_OBJECTS:bro_${name}>" ${bro_SUBDIR_LIBS} CACHE INTERNAL
"subdir libraries")
set(bro_SUBDIR_DEPS "bro_${name}" ${bro_SUBDIR_DEPS} CACHE INTERNAL "subdir dependencies")
add_clang_tidy_files(${ARGN})
endfunction ()
Loading