From d566744fc061b5140319a0807e237a7b6e451735 Mon Sep 17 00:00:00 2001 From: Neil Stephens Date: Wed, 15 May 2024 18:11:26 +1000 Subject: [PATCH] Attempt to fix CI issues --- .github/workflows/opendatacon.yml | 2 +- CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/opendatacon.yml b/.github/workflows/opendatacon.yml index ab067a42..0c5f998e 100644 --- a/.github/workflows/opendatacon.yml +++ b/.github/workflows/opendatacon.yml @@ -99,7 +99,7 @@ jobs: - if: contains(matrix.os,'macos') name: Setup MacOS Environment run: | - brew install libmodbus socat openssl + brew install libmodbus socat openssl python echo 'TOOLCHAIN_OPT=-DPACKAGE_DNP3=OFF -DPACKAGE_LIBMODBUS=OFF -DPACKAGE_PYTHON=OFF -DPACKAGE_DNP3=OFF -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl@3' >> $GITHUB_ENV echo 'BINDIR=bin/' >> $GITHUB_ENV diff --git a/CMakeLists.txt b/CMakeLists.txt index fc7dff02..b5521c27 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -180,7 +180,7 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC") # If you dont want the ZERO_CHECK project in VS have the following line enabled. set(CMAKE_SUPPRESS_REGENERATION true) endif() - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W3 /MP /Zc:rvalueCast") + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /SAFESEH:NO /W3 /MP /Zc:rvalueCast") # tell asio to only compile once (where is included) # use CXX_FLAGS (instead of add_definitions) so we can use it for external libraries too set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /DASIO_SEPARATE_COMPILATION")