osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

CMake: Pass /diagnostics:caret to Visual C++. 

Pass /diagnostics:caret to Visual C++ so in order to bring us in line
with Clang and gcc.
This commit is contained in:
Gerald Combs 2021-04-14 11:41:23 -07:00 committed by Wireshark GitLab Utility
parent 7a199b6e05
commit 8af90fcf47
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -463,6 +463,8 @@ if( CMAKE_C_COMPILER_ID MATCHES "MSVC")
# To do: Add /external:... See https://devblogs.microsoft.com/cppblog/broken-warnings-theory/
#
# /diagnostics:caret Place a caret under compilation issues similar to
# Clang and gcc.
# /Zo Enhanced debugging of optimised code
# /utf-8 Set Source and Executable character sets to UTF-8
# VS2015(MSVC14): On by default when /Zi or /Z7 used.
@ -472,7 +474,7 @@ if( CMAKE_C_COMPILER_ID MATCHES "MSVC")
# https://gitlab.kitware.com/cmake/cmake/commit/f973d49ab9d4c59b93f6dac812a94bb130200836
# /Qspectre Speculative execution attack mitigation
# See https://devblogs.microsoft.com/cppblog/spectre-mitigations-in-msvc/
list(APPEND LOCAL_CFLAGS /Zo /utf-8 /guard:cf)
list(APPEND LOCAL_CFLAGS /diagnostics:caret /Zo /utf-8 /guard:cf)
set(WS_LINK_FLAGS "${WS_LINK_FLAGS} /guard:cf")
# /Qspectre is not available for VS2015 or older VS2017. Test for its availability.
set(WIRESHARK_COMMON_FLAGS /Qspectre)