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

Update minimum required CMake to 3.5

Browse source 
Also now uses CMake's ENABLE_EXPORTS target property for the zeek
executable to ensure symbols are visible to plugins.  Prior to CMake
3.4, the policy was to export symbols by default for certain platforms,
but later versions need either the explicit target property or policy.
This commit is contained in:
Jon Siwek 2020-12-01 22:01:58 -08:00
parent 4498c52a8b
commit 3605e04d83
19 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -1,6 +1,6 @@
# When changing the minimum version here, also adapt
# auxil/zeek-aux/plugin-support/skeleton/CMakeLists.txt
cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
project(Zeek C CXX)

2
NEWS
View file

@ -157,6 +157,8 @@ Removed Functionality
- Python 2 is no longer supported. Python 3.5 is the new minimum requirement.
- CMake versions less than 3.5 are no longer supported.
Deprecated Functionality
------------------------

2
auxil/bifcl

@ -1 +1 @@
Subproject commit e265d659fd86d7439de0f12a31f9c12a786836da
Subproject commit cac669a3d728e85f113c3d3dc589f5fc04d75e59

2
auxil/binpac

@ -1 +1 @@
Subproject commit f1392c6af9337c9454ab43e539739b4c8abc9bae
Subproject commit 2eae1ff58b43b8ef22792b9eee1177a7543f27e4

2
auxil/broker

@ -1 +1 @@
Subproject commit 65e7ffa63c3abae1ce485154fbc2ff7c7cafbf04
Subproject commit 16b3c2981bbdecf3d4ff15c4f4a93c6d7fe8663d

2
auxil/paraglob

@ -1 +1 @@
Subproject commit d83dc2a0bb6afe1c5389bc965777506b76dc9a8c
Subproject commit 48269ea29b141ea808293e8558fd803a005dc8c2

2
auxil/zeek-archiver

@ -1 +1 @@
Subproject commit 107b7bd51d530df888996553123992d05f1ee27b
Subproject commit e4593363e90b848a2c4673760a179f4292833327

2
auxil/zeek-aux

@ -1 +1 @@
Subproject commit 1ba32fede011342d0d6abeec1985a07585f90083
Subproject commit cee895d87d469c5eb1acb07e22bece679bc1839c

2
auxil/zeekctl

@ -1 +1 @@
Subproject commit 6d1e1f9dbebf1d2463a0c6fb480440e7d68ba472
Subproject commit d6279a4f99153f572d8c8bf7370060cd768d6db0

2
cmake

@ -1 +1 @@
Subproject commit d02e87b1b0af10c0df65f13ffc70a990411b9724
Subproject commit 146445e5bbef1e8f3b050659e3b13c9de92e1254

6
src/CMakeLists.txt
View file

@ -400,10 +400,8 @@ add_executable(zeek main.cc
${bro_PLUGIN_LIBS}
)
target_link_libraries(zeek ${zeekdeps} ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS})
if ( NOT "${bro_LINKER_FLAGS}" STREQUAL "" )
set_target_properties(zeek PROPERTIES LINK_FLAGS "${bro_LINKER_FLAGS}")
endif ()
# Export symbols from zeek executable for use by plugins
set_target_properties(zeek PROPERTIES ENABLE_EXPORTS TRUE)
install(TARGETS zeek DESTINATION bin)

2
testing/btest/plugins/binpac-flowbuffer-frame-length-plugin/CMakeLists.txt
View file

@ -1,7 +1,7 @@
project(Zeek-Plugin-Foo-FOO)
cmake_minimum_required(VERSION 2.6.3)
cmake_minimum_required(VERSION 3.5)
if ( NOT ZEEK_DIST )
message(FATAL_ERROR "ZEEK_DIST not set")

2
testing/btest/plugins/file-plugin/CMakeLists.txt
View file

@ -1,7 +1,7 @@
project(Zeek-Plugin-Demo-Foo)
cmake_minimum_required(VERSION 2.6.3)
cmake_minimum_required(VERSION 3.5)
if ( NOT BRO_DIST )
message(FATAL_ERROR "BRO_DIST not set")

2
testing/btest/plugins/packet-protocol-plugin/CMakeLists.txt
View file

@ -1,7 +1,7 @@
project(Zeek-Packet-Plugin-Demo)
cmake_minimum_required(VERSION 2.6.3)
cmake_minimum_required(VERSION 3.5)
if ( NOT ZEEK_DIST )
message(FATAL_ERROR "ZEEK_DIST not set")

2
testing/btest/plugins/pktdumper-plugin/CMakeLists.txt
View file

@ -1,7 +1,7 @@
project(Zeek-Plugin-Demo-Foo)
cmake_minimum_required(VERSION 2.6.3)
cmake_minimum_required(VERSION 3.5)
if ( NOT ZEEK_DIST )
message(FATAL_ERROR "ZEEK_DIST not set")

2
testing/btest/plugins/pktsrc-plugin/CMakeLists.txt
View file

@ -1,7 +1,7 @@
project(Zeek-Plugin-Demo-Foo)
cmake_minimum_required(VERSION 2.6.3)
cmake_minimum_required(VERSION 3.5)
if ( NOT ZEEK_DIST )
message(FATAL_ERROR "ZEEK_DIST not set")

2
testing/btest/plugins/protocol-plugin/CMakeLists.txt
View file

@ -1,7 +1,7 @@
project(Zeek-Plugin-Demo-Foo)
cmake_minimum_required(VERSION 2.6.3)
cmake_minimum_required(VERSION 3.5)
if ( NOT ZEEK_DIST )
message(FATAL_ERROR "ZEEK_DIST not set")

2
testing/btest/plugins/reader-plugin/CMakeLists.txt
View file

@ -1,7 +1,7 @@
project(Zeek-Plugin-Demo-Foo)
cmake_minimum_required(VERSION 2.6.3)
cmake_minimum_required(VERSION 3.5)
if ( NOT ZEEK_DIST )
message(FATAL_ERROR "ZEEK_DIST not set")

2
testing/btest/plugins/writer-plugin/CMakeLists.txt
View file

@ -1,7 +1,7 @@
project(Zeek-Plugin-Demo-Foo)
cmake_minimum_required(VERSION 2.6.3)
cmake_minimum_required(VERSION 3.5)
if ( NOT ZEEK_DIST )
message(FATAL_ERROR "ZEEK_DIST not set")