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

Remove Windows linker flags from the CMake link flags test as the 

test doesn't actually pass the flags to the VS linker.

Change-Id: I5d546afcb80a49e39143078bc8f0855b0ba0f7e8
Reviewed-on: https://code.wireshark.org/review/5384
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
This commit is contained in:
Graham Bloice 2014-11-18 15:59:44 +00:00
parent 39b0c2def0
commit 61b0638e94
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeLists.txt
View File

@ -195,6 +195,10 @@ if( CMAKE_C_COMPILER_ID MATCHES "MSVC")
${LOCAL_CFLAGS}
${WARNINGS_CFLAGS}
)
# Set in Makefile.nmake
set(WS_LINK_FLAGS "/LARGEADDRESSAWARE /MANIFEST:NO")
else()
if(CMAKE_OSX_DEPLOYMENT_TARGET)
if(APPLE)
@ -432,13 +436,7 @@ else()
endif()
if( CMAKE_C_COMPILER_ID MATCHES "MSVC")
# Set in Makefile.nmake
set(WIRESHARK_LD_FLAGS
/LARGEADDRESSAWARE
/MANIFEST:NO
)
else()
if(NOT CMAKE_C_COMPILER_ID MATCHES "MSVC")
set(WIRESHARK_LD_FLAGS
-Wl,--as-needed
# -flto