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

Fix build with external CAF but bundled Broker

Browse source
This commit is contained in:
Dominik Charousset 2019-10-01 20:50:44 +02:00
parent e263589140
commit b618c7d0e2
1 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

19
CMakeLists.txt
View file

@ -339,11 +339,17 @@ InstallSymlink("${CMAKE_INSTALL_PREFIX}/bin/zeek-wrapper" "${CMAKE_INSTALL_PREFI
######################################################################## ########################################################################
## Recurse on sub-directories ## Recurse on sub-directories
if ( BROKER_ROOT_DIR ) if ( CAF_ROOT_DIR )
find_package(Broker REQUIRED)
find_package(CAF COMPONENTS core io openssl REQUIRED) find_package(CAF COMPONENTS core io openssl REQUIRED)
endif ()
set(zeekdeps ${zeekdeps} ${BROKER_LIBRARY} ${CAF_LIBRARIES}) if ( BROKER_ROOT_DIR )
# Avoid calling find_package(CAF) twice.
if ( NOT CAF_ROOT_DIR )
find_package(CAF COMPONENTS core io openssl REQUIRED)
endif ()
find_package(Broker REQUIRED)
set(zeekdeps ${zeekdeps} ${BROKER_LIBRARY})
include_directories(BEFORE ${BROKER_INCLUDE_DIR}) include_directories(BEFORE ${BROKER_INCLUDE_DIR})
else () else ()
set(ENABLE_STATIC_ONLY_SAVED ${ENABLE_STATIC_ONLY}) set(ENABLE_STATIC_ONLY_SAVED ${ENABLE_STATIC_ONLY})
@ -364,8 +370,11 @@ else ()
${CMAKE_CURRENT_BINARY_DIR}/aux/broker/include) ${CMAKE_CURRENT_BINARY_DIR}/aux/broker/include)
endif () endif ()
# CAF headers aren't necessarily in same location as Broker headers and # CAF_LIBRARIES and CAF_INCLUDE_DIRS are defined either by calling
# inclusion of a Broker header may pull in CAF headers. # find_package(CAF) or by calling add_subdirectory(aux/broker). In either case,
# we have to care about CAF here because Broker headers can pull in CAF
# headers.
set(zeekdeps ${zeekdeps} ${CAF_LIBRARIES})
include_directories(BEFORE ${CAF_INCLUDE_DIRS}) include_directories(BEFORE ${CAF_INCLUDE_DIRS})
add_subdirectory(aux/paraglob) add_subdirectory(aux/paraglob)