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

Merge remote-tracking branch 'origin/topic/neverlord/cmake-cleanup'

Browse source 
* origin/topic/neverlord/cmake-cleanup:
  Remove explicit use of config mode for finding CAF
This commit is contained in:
Jon Siwek 2020-12-17 16:11:10 -08:00
commit ed4afa95d3
9 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,4 +1,8 @@
4.1.0-dev.10 | 2020-12-17 16:11:10 -0800
* Remove explicit use of config mode for finding CAF (Dominik Charousset, Corelight)
4.1.0-dev.7 | 2020-12-16 15:10:04 -0800
* logging/ascii: Atomically create .shadow files using rename() (Arne Welzel, Corelight)

4
CMakeLists.txt
View file

@ -314,11 +314,11 @@ endif ()
if ( CAF_ROOT OR BROKER_ROOT_DIR )
# TODO: drop < 3.12 compatibility check when raising the minimum CMake version
if ( CAF_ROOT AND CMAKE_VERSION VERSION_LESS 3.12 )
find_package(CAF ${CAF_VERSION_MIN_REQUIRED} REQUIRED CONFIG
find_package(CAF ${CAF_VERSION_MIN_REQUIRED} REQUIRED
COMPONENTS openssl test io core
PATHS "${CAF_ROOT}")
else ()
find_package(CAF ${CAF_VERSION_MIN_REQUIRED} REQUIRED CONFIG
find_package(CAF ${CAF_VERSION_MIN_REQUIRED} REQUIRED
COMPONENTS openssl test io core)
endif ()
message(STATUS "Using system CAF version ${CAF_VERSION}")

2
VERSION
View file

@ -1 +1 @@
4.1.0-dev.7
4.1.0-dev.10

2
auxil/bifcl

@ -1 +1 @@
Subproject commit d9553a5db66d4d732d5c0b55b216fc3244f3e095
Subproject commit 00f69a62ae6e755d9655208e601a3a4c29ff8b5a

2
auxil/binpac

@ -1 +1 @@
Subproject commit 314fd023a7f5913d60d2550cec4cadf1c0b44e02
Subproject commit 0622e88cef0e4cf9e0843af2a78a039a99ae8744

2
auxil/broker

@ -1 +1 @@
Subproject commit f3a6f0ea4b5878d5199fb5abca26160161365f66
Subproject commit 43ce69c1f428f0ec34c53e879dd43651a0b1e5a3

2
auxil/zeek-aux

@ -1 +1 @@
Subproject commit 32723000792810ea0427ad0413dac2001eaf26dd
Subproject commit 7f44a91c409dec11da94945343888801d99bc856

2
auxil/zeekctl

@ -1 +1 @@
Subproject commit 90340580cc30989384de16daa5cfa84de2fdd9e2
Subproject commit 132d91817d60d872af094eda55757e3f58716541

2
cmake

@ -1 +1 @@
Subproject commit 40251ae850dee52eae8eb05e552c165e2deef354
Subproject commit 2be57664680c23dc3b3b140f45c7bc5ab61256b1