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

Merge remote-tracking branch 'origin/topic/awelzel/2422-exclude-empty-dirs'

Browse source 
* origin/topic/awelzel/2422-exclude-empty-dirs:
  cmake: Exclude empty directories due to headers install
This commit is contained in:
Robin Sommer 2022-09-27 13:32:20 +02:00
commit 2e58d6a1a9
3 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
CHANGES
View file

@ -1,3 +1,8 @@
5.2.0-dev.19 | 2022-09-27 13:32:20 +0200
* GH-2422: cmake: Exclude empty directories due to headers install
(Arne Welzel, Corelight)
5.2.0-dev.17 | 2022-09-27 13:30:27 +0200 5.2.0-dev.17 | 2022-09-27 13:30:27 +0200
* packet_analysis: Do not raise analyzer_confirmation per-packet for * packet_analysis: Do not raise analyzer_confirmation per-packet for

2
VERSION
View file

@ -1 +1 @@
5.2.0-dev.17 5.2.0-dev.19

6
src/CMakeLists.txt
View file

@ -584,6 +584,12 @@ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/
PATTERN "3rdparty/*" EXCLUDE PATTERN "3rdparty/*" EXCLUDE
# The "zeek -> ." symlink isn't needed in the install-tree # The "zeek -> ." symlink isn't needed in the install-tree
REGEX "^${escaped_path}$" EXCLUDE REGEX "^${escaped_path}$" EXCLUDE
# FILES_MATCHING creates empty directories:
# https://gitlab.kitware.com/cmake/cmake/-/issues/17122
# Exclude the ones that this affects explicitly.
PATTERN "script_opt/CPP/maint" EXCLUDE
PATTERN "fuzzers/corpora" EXCLUDE
) )
install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/