diff options
| author | Hadriel Kaplan <hadrielk@yahoo.com> | 2015-08-19 23:29:13 -0400 |
|---|---|---|
| committer | Hadriel Kaplan <hadrielk@yahoo.com> | 2015-08-20 03:33:29 +0000 |
| commit | 3b5a1f257fbb031009c9cbd616116979e34aaa7d (patch) | |
| tree | 9018e51d9e8d528e8be6aee498f00992d5633df5 /cmake | |
| parent | 6fb6edeaf1923e4e733cbcf9d2bf0354c7037a81 (diff) | |
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>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/UseWinLibs.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmake/modules/UseWinLibs.cmake b/cmake/modules/UseWinLibs.cmake index 90957abb3f..9e31082dde 100644 --- a/cmake/modules/UseWinLibs.cmake +++ b/cmake/modules/UseWinLibs.cmake @@ -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() |