Attempt to fix CI issues

neilstephens · May 15, 2024 · d566744 · d566744
1 parent 9ae3c01
commit d566744
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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 <asio/impl/src.hpp> 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")