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/fastpath'

Browse source 
* origin/fastpath:
  Fix finding of kerberos and libmaxminddb in CMakeLists.txt
This commit is contained in:
Jon Siwek 2018-08-23 16:54:24 -05:00
commit d43238fe69
3 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CHANGES
View file

@ -1,4 +1,10 @@
2.5-903 | 2018-08-23 16:54:24 -0500
* Fix finding of kerberos and libmaxminddb CMake < 3.3 (Daniel Thayer)
* BIT-1885: fix "kill" threading message (Jon Siwek, Corelight)
2.5-900 | 2018-08-23 15:18:48 -0500 2.5-900 | 2018-08-23 15:18:48 -0500
* Improve readability of the Travis job log (Daniel Thayer) * Improve readability of the Travis job log (Daniel Thayer)

4
CMakeLists.txt
View file

@ -134,7 +134,7 @@ include_directories(BEFORE
set(USE_GEOIP false) set(USE_GEOIP false)
find_package(LibMMDB) find_package(LibMMDB)
if (LibMMDB_FOUND) if (LIBMMDB_FOUND)
set(USE_GEOIP true) set(USE_GEOIP true)
include_directories(BEFORE ${LibMMDB_INCLUDE_DIR}) include_directories(BEFORE ${LibMMDB_INCLUDE_DIR})
list(APPEND OPTLIBS ${LibMMDB_LIBRARY}) list(APPEND OPTLIBS ${LibMMDB_LIBRARY})
@ -143,7 +143,7 @@ endif ()
set(USE_KRB5 false) set(USE_KRB5 false)
if ( ${CMAKE_SYSTEM_NAME} MATCHES Linux ) if ( ${CMAKE_SYSTEM_NAME} MATCHES Linux )
find_package(LibKrb5) find_package(LibKrb5)
if (LibKrb5_FOUND) if (LIBKRB5_FOUND)
set(USE_KRB5 true) set(USE_KRB5 true)
list(APPEND OPTLIBS ${LibKrb5_LIBRARY}) list(APPEND OPTLIBS ${LibKrb5_LIBRARY})
endif () endif ()

2
VERSION
View file

@ -1 +1 @@
2.5-900 2.5-903