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/topic/johanna/openssl-fixes'

Browse source 
* origin/topic/johanna/openssl-fixes:
  Change ordering of include directories.

BIT-1928 #merged
This commit is contained in:
Jon Siwek 2018-04-30 16:48:22 -05:00
commit 60e943322f
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
CMakeLists.txt
View file

@ -114,7 +114,6 @@ endif ()
include_directories(BEFORE
${PCAP_INCLUDE_DIR}
${OPENSSL_INCLUDE_DIR}
${BIND_INCLUDE_DIR}
${BinPAC_INCLUDE_DIR}
${ZLIB_INCLUDE_DIR}
@ -164,6 +163,12 @@ if (ENABLE_PERFTOOLS_DEBUG OR ENABLE_PERFTOOLS)
# perftools weren't found
endif ()
# Making sure any non-standard OpenSSL includes get searched earlier
# than other dependencies which tend to be in standard system locations
# and thus cause the system OpenSSL headers to still be picked up even
# if one specifies --with-openssl (which may be common).
include_directories(BEFORE ${OPENSSL_INCLUDE_DIR})
set(brodeps
${BinPAC_LIBRARY}
${PCAP_LIBRARY}

2
cmake

@ -1 +1 @@
Subproject commit 70fc7406f4baa87da9362c2b80ee6bbcdb242e0a
Subproject commit c8f07c6bf90b472fb54b2ecbe0497238f40dec8a