blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-31 04:00:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixes for address sanitizer on Windows

Browse source
This commit is contained in:
Dan Paulat 2024-01-07 20:50:25 -06:00
parent 03f4b486d6
commit f9d621d940
9 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
scwx-qt/scwx-qt.cmake
View file

@ -510,11 +510,11 @@ endif()
# Address Sanitizer options
if (SCWX_ADDRESS_SANITIZER)
target_compile_options(scwx-qt PRIVATE
$<$<CXX_COMPILER_ID:MSVC>:/fsanitize=address>
$<$<CXX_COMPILER_ID:MSVC>:/fsanitize=address /EHsc /D_DISABLE_STRING_ANNOTATION /D_DISABLE_VECTOR_ANNOTATION>
$<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-fsanitize=address -fsanitize-recover=address>
)
target_compile_options(supercell-wx PRIVATE
$<$<CXX_COMPILER_ID:MSVC>:/fsanitize=address>
$<$<CXX_COMPILER_ID:MSVC>:/fsanitize=address /EHsc /D_DISABLE_STRING_ANNOTATION /D_DISABLE_VECTOR_ANNOTATION>
$<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-fsanitize=address -fsanitize-recover=address>
)
target_link_options(supercell-wx PRIVATE

2
wxdata/include/scwx/awips/message.hpp
View file

@ -7,7 +7,7 @@
#include <map>
#include <string>
#ifdef WIN32
#ifdef _WIN32
# include <WinSock2.h>
#else
# include <arpa/inet.h>

2
wxdata/include/scwx/wsr88d/rda/level2_message.hpp
View file

@ -3,7 +3,7 @@
#include <scwx/awips/message.hpp>
#include <scwx/wsr88d/rda/level2_message_header.hpp>
#ifdef WIN32
#ifdef _WIN32
# include <WinSock2.h>
#else
# include <arpa/inet.h>

2
wxdata/source/scwx/awips/wmo_header.cpp
View file

@ -6,7 +6,7 @@
#include <sstream>
#include <string>
#ifdef WIN32
#ifdef _WIN32
# include <WinSock2.h>
#else
# include <arpa/inet.h>

2
wxdata/source/scwx/util/float.cpp
View file

@ -3,7 +3,7 @@
#include <cmath>
#include <cstring>
#ifdef WIN32
#ifdef _WIN32
# include <WinSock2.h>
#else
# include <arpa/inet.h>

2
wxdata/source/scwx/wsr88d/rda/level2_message_header.cpp
View file

@ -4,7 +4,7 @@
#include <istream>
#include <string>
#ifdef WIN32
#ifdef _WIN32
# include <WinSock2.h>
#else
# include <arpa/inet.h>

2
wxdata/source/scwx/wsr88d/rpg/ccb_header.cpp
View file

@ -6,7 +6,7 @@
#include <sstream>
#include <string>
#ifdef WIN32
#ifdef _WIN32
# include <WinSock2.h>
#else
# include <arpa/inet.h>

2
wxdata/source/scwx/wsr88d/rpg/level3_message_header.cpp
View file

@ -4,7 +4,7 @@
#include <istream>
#include <string>
#ifdef WIN32
#ifdef _WIN32
# include <WinSock2.h>
#else
# include <arpa/inet.h>

2
wxdata/wxdata.cmake
View file

@ -294,7 +294,7 @@ set_target_properties(wxdata PROPERTIES CXX_STANDARD 20
# Address Sanitizer options
if (SCWX_ADDRESS_SANITIZER)
target_compile_options(wxdata PRIVATE
$<$<CXX_COMPILER_ID:MSVC>:/fsanitize=address>
$<$<CXX_COMPILER_ID:MSVC>:/fsanitize=address /EHsc /D_DISABLE_STRING_ANNOTATION /D_DISABLE_VECTOR_ANNOTATION>
$<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-fsanitize=address -fsanitize-recover=address>
)
endif()