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/jsiwek/exclude-installing-zeek-symlink'

Browse source 
* origin/topic/jsiwek/exclude-installing-zeek-symlink:
  Exclude installing "zeek -> ." include dir symlink
This commit is contained in:
Jon Siwek 2020-09-04 18:30:19 -07:00
commit 90f04c3d0a
3 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
CHANGES
View file

@ -1,4 +1,11 @@
3.3.0-dev.249 | 2020-09-04 18:30:19 -0700
* Exclude installing "zeek -> ." include dir symlink (Jon Siwek, Corelight)
The symlink only exists for use within the source-tree and isn't needed
for the install-tree.
3.3.0-dev.247 | 2020-09-04 17:24:28 -0700 3.3.0-dev.247 | 2020-09-04 17:24:28 -0700
* GH-165: Fix global initializations that indirectly use builtin types (Jon Siwek, Corelight) * GH-165: Fix global initializations that indirectly use builtin types (Jon Siwek, Corelight)

2
VERSION
View file

@ -1 +1 @@
3.3.0-dev.247 3.3.0-dev.249

2
src/CMakeLists.txt
View file

@ -467,6 +467,8 @@ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/
PATTERN "*.h" PATTERN "*.h"
PATTERN "*.pac" PATTERN "*.pac"
PATTERN "3rdparty/*" EXCLUDE PATTERN "3rdparty/*" EXCLUDE
# The "zeek -> ." symlink isn't needed in the install-tree
REGEX "^${CMAKE_CURRENT_SOURCE_DIR}/zeek$" EXCLUDE
) )
install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/