Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 06:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Update build script

Browse source 
Add back a couple changes that got lost during cleanup.
This commit is contained in:
Peter Cullen 2024-04-04 16:33:25 +00:00 • committed by Christian Kreibich
parent d57679e3dd
commit cf09f137bd
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -80,6 +80,8 @@ set(CPACK_SOURCE_IGNORE_FILES "" CACHE STRING "Files to be ignored by CPack")
set(ZEEK_INCLUDE_PLUGINS "" CACHE STRING "Extra plugins to add to the build.") set(ZEEK_INCLUDE_PLUGINS "" CACHE STRING "Extra plugins to add to the build.")
set(ZEEK_VERSION_LOCAL "" CACHE STRING "Custom version string.")
# Look into the build tree for additional CMake modules. # Look into the build tree for additional CMake modules.
list(APPEND CMAKE_MODULE_PATH ${CMAKE_BINARY_DIR}) list(APPEND CMAKE_MODULE_PATH ${CMAKE_BINARY_DIR})
list(APPEND CMAKE_PREFIX_PATH ${CMAKE_BINARY_DIR}) list(APPEND CMAKE_PREFIX_PATH ${CMAKE_BINARY_DIR})

2
docker/Makefile
View file

@ -5,7 +5,7 @@ LOCALVERSION ?= ""
LOCAL_VERSION_FLAG = "" LOCAL_VERSION_FLAG = ""
ifneq ($(LOCALVERSION), "") ifneq ($(LOCALVERSION), "")
VERSION := $(VERSION)-$(LOCALVERSION) VERSION := $(VERSION)-$(LOCALVERSION)
LOCAL_VERSION_FLAG := "--localversion=$(LOCALVERSION)" LOCAL_VERSION_FLAG := --localversion=$(LOCALVERSION)
endif endif
BUILD_IMAGE := zeek-builder:$(VERSION) BUILD_IMAGE := zeek-builder:$(VERSION)
BUILD_CONTAINER := zeek-builder-container-$(VERSION) BUILD_CONTAINER := zeek-builder-container-$(VERSION)