From 2e3425000f3443e243a43c34b266f95d51bf8fe8 Mon Sep 17 00:00:00 2001 From: voidbar Date: Thu, 3 Nov 2022 19:26:44 +0200 Subject: [PATCH] Apply suggestions from code review Co-authored-by: Tim Wojtulewicz --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e811f2948f..2b960d522b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -420,7 +420,7 @@ FindRequiredPackage(FLEX) FindRequiredPackage(BISON) FindRequiredPackage(PCAP) FindRequiredPackage(OpenSSL) -if ( NOT WIN32 ) +if ( NOT MSVC ) FindRequiredPackage(BIND) endif () FindRequiredPackage(ZLIB) @@ -733,7 +733,7 @@ if ( ${CMAKE_SYSTEM_NAME} MATCHES Linux ) endif () set(DEFAULT_ZEEKPATH_PATHS . ${ZEEK_SCRIPT_INSTALL_PATH} ${ZEEK_SCRIPT_INSTALL_PATH}/policy ${ZEEK_SCRIPT_INSTALL_PATH}/site ${ZEEK_SCRIPT_INSTALL_PATH}/builtin-plugins) -if ( WIN32 ) +if ( MSVC ) list(JOIN DEFAULT_ZEEKPATH_PATHS ";" DEFAULT_ZEEKPATH) else () list(JOIN DEFAULT_ZEEKPATH_PATHS ":" DEFAULT_ZEEKPATH) @@ -791,7 +791,7 @@ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/cmake DESTINATION share/zeek USE_SOURCE_PERMISSIONS PATTERN ".git" EXCLUDE) -if ( NOT WIN32 ) +if ( NOT MSVC ) # Install wrapper script for Bro-to-Zeek renaming. include(InstallShellScript) include(InstallSymlink)