diff options
| author | Hadriel Kaplan <hadrielk@yahoo.com> | 2015-08-20 08:48:46 -0400 |
|---|---|---|
| committer | Hadriel Kaplan <hadrielk@yahoo.com> | 2015-08-20 12:49:41 +0000 |
| commit | ba69473c8792f892744005fc119b74d336f08481 (patch) | |
| tree | 384137df45163bb0eb21b61d036ec9331d38b2b0 /cmake | |
| parent | 72497918b16b706c3ba75e1f731f58b802ca14d1 (diff) | |
| download | wireshark-ba69473c8792f892744005fc119b74d336f08481.tar.gz | |
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 <hadrielk@yahoo.com>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/UseWinLibs.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
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() |