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

Merge remote-tracking branch 'origin/topic/timw/1654-exclude-cmake-dot-git'

Browse source 
* origin/topic/timw/1654-exclude-cmake-dot-git:
  GH-1654: Exclude the .git directory when installing cmake files
This commit is contained in:
Tim Wojtulewicz 2021-07-30 08:52:49 -07:00
commit e89a743901
3 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,3 +1,7 @@
4.2.0-dev.56 | 2021-07-30 08:52:49 -0700
* GH-1654: Exclude the .git directory when installing cmake files (Tim Wojtulewicz, Corelight)
4.2.0-dev.54 | 2021-07-29 13:23:51 -0700 4.2.0-dev.54 | 2021-07-29 13:23:51 -0700
* GH-1692: Add some safety to ASN's binary_to_int64 to avoid bad shifts (Tim Wojtulewicz, Corelight) * GH-1692: Add some safety to ASN's binary_to_int64 to avoid bad shifts (Tim Wojtulewicz, Corelight)

3
CMakeLists.txt
View file

@ -547,7 +547,8 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zeek-config.in
install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/zeek-config DESTINATION bin) install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/zeek-config DESTINATION bin)
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/cmake DESTINATION share/zeek install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/cmake DESTINATION share/zeek
USE_SOURCE_PERMISSIONS) USE_SOURCE_PERMISSIONS
PATTERN ".git" EXCLUDE)
# Install wrapper script for Bro-to-Zeek renaming. # Install wrapper script for Bro-to-Zeek renaming.
include(InstallShellScript) include(InstallShellScript)

2
VERSION
View file

@ -1 +1 @@
4.2.0-dev.54 4.2.0-dev.56