osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

wslua+lrexlib: Fixup our dependencies and paths. 

Add a register_wslua target and have lrexlib depend on it so that
declare_wslual.h is generated in the right order. The working directory
when we create declare_wslua.h and register_wslua.c is epan/wslua,
so there's no need to explicitly set it. Remove an unneeded lrexlib
include path.
This commit is contained in:
Gerald Combs 2022-07-22 11:53:34 -07:00
parent 74082386de
commit fd830dff58
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
epan/wslua/CMakeLists.txt
View File

@ -88,20 +88,27 @@ add_custom_command(
add_custom_command(
OUTPUT
${CMAKE_BINARY_DIR}/epan/wslua/declare_wslua.h
${CMAKE_BINARY_DIR}/epan/wslua/register_wslua.c
declare_wslua.h
register_wslua.c
COMMAND
${PYTHON_EXECUTABLE}
${CMAKE_SOURCE_DIR}/epan/wslua/make-reg.py
${WSLUA_MODULES}
WORKING_DIRECTORY
${CMAKE_BINARY_DIR}/epan/wslua
DEPENDS
${CMAKE_SOURCE_DIR}/epan/wslua/make-reg.py
${WSLUA_MODULES}
# ${CMAKE_CURRENT_BINARY_DIR}/taps_wslua.c
)
add_custom_target(
register_wslua ALL
DEPENDS
declare_wslua.h
register_wslua.c
)
set_target_properties(register_wslua PROPERTIES FOLDER "Libs/epan/wslua")
add_custom_command(
OUTPUT init.lua
COMMAND ${PYTHON_EXECUTABLE}

3
epan/wslua/lrexlib/CMakeLists.txt
View File

@ -13,12 +13,13 @@ target_link_libraries(lrexlib PRIVATE
)
target_include_directories(lrexlib SYSTEM PRIVATE
${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/epan
${LUA_INCLUDE_DIRS}
${PCRE2_INCLUDE_DIRS}
)
add_dependencies(lrexlib register_wslua)
add_compile_definitions(
VERSION=\"2.9.1\"
PCRE2_CODE_UNIT_WIDTH=8