Skip to content

Commit d71c0ce

Browse files
committed
Add /EHsc flag
* Add back `CMAKE_CXX_STANDARD: "17"`
1 parent 2737a32 commit d71c0ce

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

.github/workflows/cpp_windows.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ jobs:
6464
ARROW_WITH_ZLIB: ON
6565
ARROW_WITH_ZSTD: ON
6666
BOOST_SOURCE: BUNDLED
67+
CMAKE_CXX_STANDARD: "17"
6768
CMAKE_GENERATOR: Ninja
6869
CMAKE_INSTALL_PREFIX: /usr
6970
CMAKE_UNITY_BUILD: ON

cpp/cmake_modules/SetupCxxFlags.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,7 @@ if(WIN32)
186186
#
187187
# ARROW-2986: Without /EHsc we get C4530 warning
188188
set(CXX_COMMON_FLAGS "/W3 /EHsc")
189+
string(APPEND CMAKE_CXX_FLAGS " /EHsc")
189190
endif()
190191

191192
# Disable C5105 (macro expansion producing 'defined' has undefined

0 commit comments

Comments
 (0)