Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions cpp/cmake_modules/ThirdpartyToolchain.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -410,15 +410,6 @@ if(ARROW_AZURE)
set(ARROW_WITH_AZURE_SDK ON)
endif()

# The macOS 11.3 SDK has incomplete C++20 concepts support, which prevents
# simdjson headers from compiling. Disable simdjson concepts for this SDK.
if(ARROW_JSON
AND CMAKE_OSX_SYSROOT
AND CMAKE_OSX_SYSROOT MATCHES "MacOSX11\\.3\\.sdk$")
message(STATUS "Disabling simdjson concepts for macOS SDK 11.3")
add_compile_definitions(SIMDJSON_CONCEPT_DISABLED=1)
endif()

if(ARROW_JSON OR ARROW_FLIGHT_SQL_ODBC)
set(ARROW_WITH_RAPIDJSON ON)
endif()
Expand Down Expand Up @@ -2832,6 +2823,13 @@ function(build_simdjson)

fetchcontent_makeavailable(simdjson)

# The macOS 11.3 SDK has incomplete C++20 concepts support, which prevents
# simdjson headers from compiling. Disable simdjson concepts for this SDK.
if(CMAKE_OSX_SYSROOT AND CMAKE_OSX_SYSROOT MATCHES "MacOSX11\\.3\\.sdk$")
message(STATUS "Disabling simdjson concepts for macOS SDK 11.3")
target_compile_definitions(simdjson PUBLIC SIMDJSON_CONCEPT_DISABLED=1)
Comment thread
Reranko05 marked this conversation as resolved.
endif()

set(SIMDJSON_VENDORED
TRUE
PARENT_SCOPE)
Expand Down
Loading