Skip to content

Commit 4ad7af1

Browse files
committed
Address Kou's comments Dec-16
Move `include(ThirdpartyToolchain)`
1 parent 20d2e85 commit 4ad7af1

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

cpp/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -520,8 +520,6 @@ endif()
520520
set(PARQUET_PC_REQUIRES "")
521521
set(PARQUET_PC_REQUIRES_PRIVATE "")
522522

523-
include(ThirdpartyToolchain)
524-
525523
# Add common flags
526524
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_COMMON_FLAGS}")
527525
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ARROW_CXXFLAGS}")
@@ -536,6 +534,8 @@ string(REPLACE "-std=c++17" "" CMAKE_C_FLAGS ${CMAKE_C_FLAGS})
536534
# Add C++-only flags, like -std=c++17
537535
set(CMAKE_CXX_FLAGS "${CXX_ONLY_FLAGS} ${CMAKE_CXX_FLAGS}")
538536

537+
include(ThirdpartyToolchain)
538+
539539
# ASAN / TSAN / UBSAN
540540
if(ARROW_FUZZING)
541541
set(ARROW_USE_COVERAGE ON)

cpp/cmake_modules/SetupCxxFlags.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,6 @@ 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")
190189
endif()
191190

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

0 commit comments

Comments
 (0)