From ba69473c8792f892744005fc119b74d336f08481 Mon Sep 17 00:00:00 2001 From: Hadriel Kaplan Date: Thu, 20 Aug 2015 08:48:46 -0400 Subject: Link setargv.obj for Windows in CMake so mergecap works Try it again. Change-Id: I511dd3d7d70fa33e246085c8cb79925e92945ebc Reviewed-on: https://code.wireshark.org/review/10148 Reviewed-by: Hadriel Kaplan --- cmake/modules/UseWinLibs.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cmake/modules/UseWinLibs.cmake') diff --git a/cmake/modules/UseWinLibs.cmake b/cmake/modules/UseWinLibs.cmake index 9e31082dde..b1d9383af5 100644 --- a/cmake/modules/UseWinLibs.cmake +++ b/cmake/modules/UseWinLibs.cmake @@ -15,6 +15,6 @@ if( WIN32 ) # 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.3