Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-05 16:18:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Default to setting ZEEK_HAVE_JAVASCRIPT=no in CMakeLists.txt

Browse source 
This still overrides it as appropriate when building with JS support, but shows
"JavaScript: no" in the configure output also when using
--disable-javascript, where it previously showed no output.
This commit is contained in:
Christian Kreibich 2024-01-12 14:56:11 -08:00
parent b97907daed
commit 2947bcda56
1 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -1113,6 +1113,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES Linux)
endif () endif ()
endif () endif ()
set(ZEEK_HAVE_JAVASCRIPT no)
if (NOT DISABLE_JAVASCRIPT) if (NOT DISABLE_JAVASCRIPT)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/auxil/zeekjs/cmake) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/auxil/zeekjs/cmake)
find_package(Nodejs) find_package(Nodejs)
@ -1123,14 +1124,11 @@ if (NOT DISABLE_JAVASCRIPT)
STATUS STATUS
"Node.js version ${NODEJS_VERSION} is too old, need 16.13 or later. Not enabling JavaScript support." "Node.js version ${NODEJS_VERSION} is too old, need 16.13 or later. Not enabling JavaScript support."
) )
set(ZEEK_HAVE_JAVASCRIPT no)
else () else ()
set(ZEEKJS_PLUGIN_PATH ${CMAKE_SOURCE_DIR}/auxil/zeekjs) set(ZEEKJS_PLUGIN_PATH ${CMAKE_SOURCE_DIR}/auxil/zeekjs)
list(APPEND ZEEK_INCLUDE_PLUGINS ${ZEEKJS_PLUGIN_PATH}) list(APPEND ZEEK_INCLUDE_PLUGINS ${ZEEKJS_PLUGIN_PATH})
set(ZEEK_HAVE_JAVASCRIPT yes) set(ZEEK_HAVE_JAVASCRIPT yes)
endif () endif ()
else ()
set(ZEEK_HAVE_JAVASCRIPT no)
endif () endif ()
endif () endif ()