From ac63f727f72f7bd197f5551796db90cecc2f58e5 Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Thu, 15 Jun 2023 18:34:13 +0200 Subject: [PATCH] Merge remote-tracking branch 'origin/topic/awelzel/3090-propagate-build-type' * origin/topic/awelzel/3090-propagate-build-type: ZeekPluginBootstrap: Encode Zeek's CMAKE_BUILD_TYPE (cherry picked from commit 2eeba959fec42ee763d8f669639adbcb4b13e93f) --- cmake | 2 +- src/ZeekPluginBootstrap.cmake.in | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/cmake b/cmake index b191c36167..edaaa3aed6 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit b191c36167bc0d6bd9f059b01ad4c99be98488d9 +Subproject commit edaaa3aed6d2f8d89c0981a5c914d151ed2c7e4d diff --git a/src/ZeekPluginBootstrap.cmake.in b/src/ZeekPluginBootstrap.cmake.in index 1e1e11713c..4a56007d41 100644 --- a/src/ZeekPluginBootstrap.cmake.in +++ b/src/ZeekPluginBootstrap.cmake.in @@ -17,3 +17,7 @@ set(ZEEK_CMAKE_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@" # the package directory. set(ZEEK_PLUGIN_SCRIPTS_PATH "${ZEEK_CMAKE_CONFIG_DIR}" CACHE PATH "Path to utility scripts for building Zeek plugins." FORCE) + +# The CMAKE_BUILD_TYPE type to use for external plugins if not overridden. +set(ZEEK_CMAKE_BUILD_TYPE "@CMAKE_BUILD_TYPE@" + CACHE PATH "Internal Zeek variable: CMAKE_BUILD_TYPE of Zeek." FORCE)