Fix issues in CMake files.

This patch formats CMake files according to the configured style and
imports the latest version of `cmake/FindSpicyPlugin.cmake` from
`zeek/spicy-analyzers`.

CMakeLists.txt

@@ -10,11 +10,9 @@ spicy_require_version("1.2.0")
 spicy_plugin_require_version("1.3.3")
 zeek_require_version("4.0.0")
 
-if(NOT CMAKE_BUILD_TYPE)
-  # Default to release build.
-  set(CMAKE_BUILD_TYPE
-      "Release"
-      CACHE STRING "")
-endif()
+if (NOT CMAKE_BUILD_TYPE)
+    # Default to release build.
+    set(CMAKE_BUILD_TYPE "Release" CACHE STRING "")
+endif ()
 
 add_subdirectory(analyzer)

analyzer/CMakeLists.txt

@@ -1,13 +1,5 @@
 spicy_add_analyzer(
-  NAME
-  IPSEC
-  PACKAGE_NAME
-  IPSEC
-  SOURCES
-  analyzer.spicy
-  analyzer.evt
-  zeek_analyzer.spicy
-  SCRIPTS
-  __load__.zeek
-  main.zeek
-  dpd.sig)
+    NAME IPSEC
+    PACKAGE_NAME IPSEC
+    SOURCES analyzer.spicy analyzer.evt zeek_analyzer.spicy
+    SCRIPTS __load__.zeek main.zeek dpd.sig)

cmake/FindSpicyPlugin.cmake

@@ -1,85 +1,78 @@
 # Find the Spicy plugin to get access to the infrastructure it provides.
 #
-# While most of the actual CMake logic for building analyzers comes with the
-# Spicy plugin for Zeek, this code bootstraps us by asking "spicyz" for the
-# plugin's location. Either make sure that "spicyz" is in PATH, set the
-# environment variable SPICYZ to point to its location, or set variable
-# ZEEK_SPICY_ROOT in either CMake or environment to point to its installation or
-# build directory.
+# While most of the actual CMake logic for building analyzers comes with the Spicy
+# plugin for Zeek, this code bootstraps us by asking "spicyz" for the plugin's
+# location. Either make sure that "spicyz" is in PATH, set the environment
+# variable SPICYZ to point to its location, or set variable ZEEK_SPICY_ROOT
+# in either CMake or environment to point to its installation or build
+# directory.
 #
 # This exports:
 #
-# SPICY_PLUGIN_FOUND            True if plugin and all dependencies were found
-# SPICYZ                        Path to spicyz SPICY_PLUGIN_VERSION Version
-# string of plugin SPICY_PLUGIN_VERSION_NUMBER   Numerical version number of
-# plugin
+#     SPICY_PLUGIN_FOUND            True if plugin and all dependencies were found
+#     SPICYZ                        Path to spicyz
+#     SPICY_PLUGIN_VERSION          Version string of plugin
+#     SPICY_PLUGIN_VERSION_NUMBER   Numerical version number of plugin
 
-function(run_spicycz output)
-  execute_process(
-    COMMAND "${SPICYZ}" ${ARGN}
-    OUTPUT_VARIABLE output_
-    OUTPUT_STRIP_TRAILING_WHITESPACE)
+# Runs `spicyz` with the flags given as second argument and stores the output in the variable named
+# by the first argument.
+function (run_spicycz output)
+    execute_process(COMMAND "${SPICYZ}" ${ARGN} OUTPUT_VARIABLE output_
+                    OUTPUT_STRIP_TRAILING_WHITESPACE)
 
-  string(STRIP "${output_}" output_)
-  set(${output}
-      "${output_}"
-      PARENT_SCOPE)
-endfunction()
+    string(STRIP "${output_}" output_)
+    set(${output} "${output_}" PARENT_SCOPE)
+endfunction ()
 
-function(spicy_plugin_require_version version)
-  string(REGEX MATCH "([0-9]*)\.([0-9]*)\.([0-9]*).*" _ ${version})
-  math(EXPR version_number
-       "${CMAKE_MATCH_1} * 10000 + ${CMAKE_MATCH_2} * 100 + ${CMAKE_MATCH_3}")
+# Checks that the Spicy plugin version it at least the given version.
+function (spicy_plugin_require_version version)
+    string(REGEX MATCH "([0-9]*)\.([0-9]*)\.([0-9]*).*" _ ${version})
+    math(EXPR version_number "${CMAKE_MATCH_1} * 10000 + ${CMAKE_MATCH_2} * 100 + ${CMAKE_MATCH_3}")
 
-  if("${SPICY_PLUGIN_VERSION_NUMBER}" LESS "${version_number}")
-    message(
-      FATAL_ERROR
-        "Package requires at least Spicy plugin version ${version}, have ${SPICY_PLUGIN_VERSION}"
-    )
-  endif()
-endfunction()
+    if ("${SPICY_PLUGIN_VERSION_NUMBER}" LESS "${version_number}")
+        message(FATAL_ERROR "Package requires at least Spicy plugin version ${version}, "
+                            "have ${SPICY_PLUGIN_VERSION}")
+    endif ()
+endfunction ()
 
-#
-# Main
-#
+###
+### Main
+###
 
-if(NOT SPICYZ)
-  set(SPICYZ "$ENV{SPICYZ}")
-endif()
+if (NOT SPICYZ)
+    set(SPICYZ "$ENV{SPICYZ}")
+endif ()
 
-if(NOT SPICYZ)
-  find_program(
-    spicyz spicyz
-    HINTS ${ZEEK_SPICY_ROOT}/bin ${ZEEK_SPICY_ROOT}/build/bin
-          $ENV{ZEEK_SPICY_ROOT}/bin $ENV{ZEEK_SPICY_ROOT}/build/bin
-          ${PROJECT_SOURCE_DIR}/../../build/bin) # support an in-tree Spicy
-                                                 # build
-  set(SPICYZ "${spicyz}")
-endif()
+if (NOT SPICYZ)
+    # Support an in-tree Spicy build.
+    find_program(
+        spicyz spicyz
+        HINTS ${ZEEK_SPICY_ROOT}/bin ${ZEEK_SPICY_ROOT}/build/bin $ENV{ZEEK_SPICY_ROOT}/bin
+              $ENV{ZEEK_SPICY_ROOT}/build/bin ${PROJECT_SOURCE_DIR}/../../build/bin)
+    set(SPICYZ "${spicyz}")
+endif ()
 
 message(STATUS "spicyz: ${SPICYZ}")
 
-if(SPICYZ)
-  set(SPICYZ
-      "${SPICYZ}"
-      CACHE PATH "" FORCE) # make sure it's in the cache
+if (SPICYZ)
+    set(SPICYZ "${SPICYZ}" CACHE PATH "" FORCE) # make sure it's in the cache
 
-  run_spicycz(SPICY_PLUGIN_VERSION "--version")
-  run_spicycz(SPICY_PLUGIN_VERSION_NUMBER "--version-number")
-  message(STATUS "Zeek plugin version: ${SPICY_PLUGIN_VERSION}")
+    run_spicycz(SPICY_PLUGIN_VERSION "--version")
+    run_spicycz(SPICY_PLUGIN_VERSION_NUMBER "--version-number")
+    message(STATUS "Zeek plugin version: ${SPICY_PLUGIN_VERSION}")
 
-  run_spicycz(spicy_plugin_path "--print-plugin-path")
-  set(spicy_plugin_cmake_path "${spicy_plugin_path}/cmake")
-  message(STATUS "Zeek plugin CMake path: ${spicy_plugin_cmake_path}")
+    run_spicycz(spicy_plugin_path "--print-plugin-path")
+    set(spicy_plugin_cmake_path "${spicy_plugin_path}/cmake")
+    message(STATUS "Zeek plugin CMake path: ${spicy_plugin_cmake_path}")
 
-  list(PREPEND CMAKE_MODULE_PATH "${spicy_plugin_cmake_path}")
-  find_package(Zeek REQUIRED)
-  find_package(Spicy REQUIRED)
-  zeek_print_summary()
-  spicy_print_summary()
+    list(PREPEND CMAKE_MODULE_PATH "${spicy_plugin_cmake_path}")
+    find_package(Zeek REQUIRED)
+    find_package(Spicy REQUIRED)
+    zeek_print_summary()
+    spicy_print_summary()
 
-  include(ZeekSpicyAnalyzerSupport)
-endif()
+    include(ZeekSpicyAnalyzerSupport)
+endif ()
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(SpicyPlugin DEFAULT_MSG SPICYZ ZEEK_FOUND)