osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

CMake: Fixup appending to WS_WIN_LIBS 

In the world of CMake calling "set" with multiple values creates a
semicolon-separated list. For WS_WIN_LIBS we want a single string so we
need to call "set" with a single, quoted value.

Change-Id: I96c5085af58adfb97ce16195eb27cc8ddb612d6a
Reviewed-on: https://code.wireshark.org/review/10158
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
This commit is contained in:
Gerald Combs 2015-08-20 11:54:04 -07:00 committed by Hadriel Kaplan
parent e67098c5d0
commit c4b93e9496
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/modules/UseWinLibs.cmake
View File

@ -13,8 +13,6 @@ if( WIN32 )
set( WIN_COMCTL32_LIBRARY comctl32.lib )
# 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} setargv.obj" )
endif()