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

Revert "Wirehark Windows: Harden build with Shadow Stack and EHCONT metadata" 

This reverts commit ebb8703a50.
This commit is contained in:
Anders Broman 2021-07-05 15:48:48 +02:00
parent 14f6769280
commit 2270056073
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
CMakeLists.txt
View File

@ -489,19 +489,6 @@ if( CMAKE_C_COMPILER_ID MATCHES "MSVC")
# /Qspectre is not available for VS2015 or older VS2017. Test for its availability.
set(WIRESHARK_COMMON_FLAGS /Qspectre)
if (MSVC_VERSION GREATER_EQUAL "1920")
# Compile with Control-flow Enforcement Technology (CET) Shadow Stack compatability
# See https://docs.microsoft.com/en-us/cpp/build/reference/cetcompat
set(WS_LINK_FLAGS "${WS_LINK_FLAGS} /CETCOMPAT")
endif()
if (MSVC_VERSION GREATER_EQUAL "1920" AND WIRESHARK_TARGET_PLATFORM MATCHES "win64")
# Enable generation of EH Continuation (EHCONT) metadata by the compiler.
# See https://docs.microsoft.com/en-us/cpp/build/reference/guard-enable-eh-continuation-metadata
list(APPEND LOCAL_CFLAGS /guard:ehcont)
set(WS_LINK_FLAGS "${WS_LINK_FLAGS} /guard:ehcont")
endif()
if(ENABLE_CODE_ANALYSIS)
# We should probably add a code_analysis.props file and use it to set
# CAExcludePath, otherwise we trigger on Qt's headers: