diff --git a/contrib/simdjson b/contrib/simdjson index 560f0742cc0..89332e16965 160000 --- a/contrib/simdjson +++ b/contrib/simdjson @@ -1 +1 @@ -Subproject commit 560f0742cc0895d00d78359dbdeb82064a24adb8 +Subproject commit 89332e169657c3a3eac49446f7394b2497c2ea46 diff --git a/contrib/simdjson-cmake/CMakeLists.txt b/contrib/simdjson-cmake/CMakeLists.txt index a07dcd487be..26e8e1a1432 100644 --- a/contrib/simdjson-cmake/CMakeLists.txt +++ b/contrib/simdjson-cmake/CMakeLists.txt @@ -1,13 +1,21 @@ set(SIMDJSON_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/simdjson/include") -set(SIMDJSON_SRC_DIR "${SIMDJSON_INCLUDE_DIR}/../src") +set(SIMDJSON_SRC_DIR "${ClickHouse_SOURCE_DIR}/contrib/simdjson/src") set(SIMDJSON_SRC - ${SIMDJSON_SRC_DIR}/document.cpp ${SIMDJSON_SRC_DIR}/error.cpp ${SIMDJSON_SRC_DIR}/implementation.cpp - ${SIMDJSON_SRC_DIR}/jsonioutil.cpp - ${SIMDJSON_SRC_DIR}/jsonminifier.cpp - ${SIMDJSON_SRC_DIR}/stage1_find_marks.cpp - ${SIMDJSON_SRC_DIR}/stage2_build_tape.cpp + ${SIMDJSON_SRC_DIR}/simdjson.cpp + + ${SIMDJSON_SRC_DIR}/arm64/implementation.cpp + ${SIMDJSON_SRC_DIR}/arm64/dom_parser_implementation.cpp + + ${SIMDJSON_SRC_DIR}/fallback/implementation.cpp + ${SIMDJSON_SRC_DIR}/fallback/dom_parser_implementation.cpp + + ${SIMDJSON_SRC_DIR}/haswell/implementation.cpp + ${SIMDJSON_SRC_DIR}/haswell/dom_parser_implementation.cpp + + ${SIMDJSON_SRC_DIR}/westmere/implementation.cpp + ${SIMDJSON_SRC_DIR}/westmere/dom_parser_implementation.cpp ) add_library(${SIMDJSON_LIBRARY} ${SIMDJSON_SRC})