diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-08-20 11:54:04 -0700 |
|---|---|---|
| committer | Hadriel Kaplan <hadrielk@yahoo.com> | 2015-08-20 19:56:22 +0000 |
| commit | c4b93e9496ff5ae159db29b8f5fddecb8db913cb (patch) | |
| tree | 62973b33ff4e153cc20996aa98d5c35f615bed73 /cmake | |
| parent | e67098c5d0270581d7c6657b17d75b5a1227043f (diff) | |
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>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/UseWinLibs.cmake | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/cmake/modules/UseWinLibs.cmake b/cmake/modules/UseWinLibs.cmake index b1d9383af5..4f45bbe5a0 100644 --- a/cmake/modules/UseWinLibs.cmake +++ b/cmake/modules/UseWinLibs.cmake @@ -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() |