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

Link setargv.obj for Windows in CMake so mergecap works 

Mergecap needs setargv.obj in order to get wildcard support. This is linked
in nmake but not cmake.

Bug: 10354
Change-Id: Icccf6b36495ac4b376f651d689b4a1f9e2c6042d
Reviewed-on: https://code.wireshark.org/review/10143
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
This commit is contained in:
Hadriel Kaplan 2015-08-19 23:29:13 -04:00
parent 6fb6edeaf1
commit 3b5a1f257f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/modules/UseWinLibs.cmake
View File

@ -12,9 +12,9 @@ if( WIN32 )
set( WIN_WSOCK32_LIBRARY wsock32.lib )
set( WIN_COMCTL32_LIBRARY comctl32.lib )
# Looks like this is not needed after all
# set( WIN_SETARGV_OBJECT setargv.obj )
# Linking with setargv.obj enables "wildcard expansion" of command-line arguments
set( WIN_SETARGV_OBJECT setargv.obj )
#
# set( WS_LINK_FLAGS ${WS_LINK_FLAGS} "${WIN_SETARGV_OBJECT}" )
set( WS_LINK_FLAGS ${WS_LINK_FLAGS} "${WIN_SETARGV_OBJECT}" )
endif()