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

CMake: fix build by not unnecessarily linking with wsutil 

When built with -DCMAKE_BUILD_WITH_INSTALL_RPATH=1, make-taps and
make-dissectors fail to run because they cannot locate libwsutil.so.0.
Since v2.9.0rc0-178-gbb81bef535 ("glib: Get rid of GLIB_CHECK_VERSION as
we now require 2.32.0") wsutil is definitely no longer needed.

Change-Id: Ida269fdb5f2cba979e3776f57c1a6bf3d546fe5d
Reviewed-on: https://code.wireshark.org/review/27329
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Peter Wu 2018-05-04 11:01:16 +02:00 committed by Anders Broman
parent 7f7f8326af
commit 8815ac76db
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
epan/dissectors/CMakeLists.txt
View File

@ -1888,8 +1888,7 @@ set(ALL_DISSECTOR_SRC
)
add_executable(make-dissectors make-dissectors.c)
# wsutil is only required for glib-compat.c
target_link_libraries(make-dissectors ${GLIB2_LIBRARIES} wsutil)
target_link_libraries(make-dissectors ${GLIB2_LIBRARIES})
if(WIN32)
add_dependencies(make-dissectors copy_cli_dlls)

3
ui/CMakeLists.txt
View File

@ -82,8 +82,7 @@ set_target_properties(ui PROPERTIES
)
add_executable(make-taps make-taps.c)
# wsutil is only required for glib-compat.c
target_link_libraries(make-taps ${GLIB2_LIBRARIES} wsutil)
target_link_libraries(make-taps ${GLIB2_LIBRARIES})
if (HTML_HELP_COMPILER)
add_definitions(-DHHC_DIR)