From 3b5a1f257fbb031009c9cbd616116979e34aaa7d Mon Sep 17 00:00:00 2001 From: Hadriel Kaplan Date: Wed, 19 Aug 2015 23:29:13 -0400 Subject: 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 --- cmake/modules/UseWinLibs.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'cmake') 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() -- cgit v1.2.1