osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

cmake: fix build without Lua 

Fixes this error:

    Objects of target "wslua" referenced but no such target exists.

Change-Id: I1168dbff538fb62f614073c28aaba6e6666f499b
Reviewed-on: https://code.wireshark.org/review/15329
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Léo Gaspard
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
This commit is contained in:
Peter Wu 2016-05-10 11:59:44 +02:00 committed by Alexis La Goutte
parent 49362062e3
commit 850411dd44
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
epan/CMakeLists.txt
View File

@ -218,6 +218,13 @@ if (WERROR_COMMON_FLAGS)
)
endif()
# Cannot use $<$<BOOL:${HAVE_LIBLUA}>:$<TARGET_OBJECTS:wslua>> as that breaks
# get_target_property(_libwireshark_location epan LOCATION).
if(HAVE_LIBLUA)
set(wslua_sources $<TARGET_OBJECTS:wslua>)
else()
set(wslua_sources)
endif()
add_library(epan ${LINK_MODE_LIB}
${LIBWIRESHARK_FILES}
${GENERATED_FILES}
@ -229,7 +236,7 @@ add_library(epan ${LINK_MODE_LIB}
$<TARGET_OBJECTS:ftypes>
$<TARGET_OBJECTS:nghttp2>
$<TARGET_OBJECTS:wmem>
$<TARGET_OBJECTS:wslua>
${wslua_sources}
${CMAKE_BINARY_DIR}/image/libwireshark.rc
)