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

GH-602: fix paraglob header inclusion, installation, and search paths

Browse source
This commit is contained in:
Jon Siwek 2019-09-26 17:39:25 -07:00
parent bc18ca44e6
commit 7613ab0af0
4 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -370,7 +370,7 @@ include_directories(BEFORE ${CAF_INCLUDE_DIRS})
add_subdirectory(aux/paraglob) add_subdirectory(aux/paraglob)
set(zeekdeps ${zeekdeps} paraglob) set(zeekdeps ${zeekdeps} paraglob)
include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/aux/paraglob) include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/aux/paraglob/include)
add_subdirectory(src) add_subdirectory(src)
add_subdirectory(scripts) add_subdirectory(scripts)

2
aux/paraglob

@ -1 +1 @@
Subproject commit b9b834c8d1ec3f2621ca504eaf60e0361fd607a2 Subproject commit bee44073a1810c7779d8563913a26ccd7fe38995

2
cmake

@ -1 +1 @@
Subproject commit 1dd6a7b3220ffdc507bb0984875bcc76f3641387 Subproject commit 672982b4e800b951b4698a03c2fab1c5b33afa74

2
src/OpaqueVal.h
View file

@ -8,7 +8,7 @@
#include "RandTest.h" #include "RandTest.h"
#include "Val.h" #include "Val.h"
#include "digest.h" #include "digest.h"
#include "src/paraglob.h" #include "paraglob/paraglob.h"
class OpaqueVal; class OpaqueVal;