Skip to content

Commit 76ee292

Browse files
rokrok
committed
cmake and lint
1 parent ae9b2e7 commit 76ee292

File tree

15 files changed

+16
-65
lines changed

15 files changed

+16
-65
lines changed

‎cpp/cmake_modules/ThirdpartyToolchain.cmake‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2584,12 +2584,13 @@ macro(build_simdjson)
25842584
message(STATUS "simdjson: Building from source")
25852585
set(SIMDJSON_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/simdjson_ep/src/simdjson_ep-install")
25862586
set(SIMDJSON_INCLUDE_DIR "${SIMDJSON_PREFIX}/include")
2587-
set(SIMDJSON_STATIC_LIB "${SIMDJSON_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}simdjson${CMAKE_STATIC_LIBRARY_SUFFIX}")
2587+
set(SIMDJSON_STATIC_LIB
2588+
"${SIMDJSON_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}simdjson${CMAKE_STATIC_LIBRARY_SUFFIX}"
2589+
)
25882590

2589-
set(SIMDJSON_CMAKE_ARGS ${EP_COMMON_CMAKE_ARGS}
2590-
-DSIMDJSON_DEVELOPER_MODE=OFF
2591-
-DSIMDJSON_BUILD_STATIC_LIB=ON
2592-
"-DCMAKE_INSTALL_PREFIX=${SIMDJSON_PREFIX}")
2591+
set(SIMDJSON_CMAKE_ARGS
2592+
${EP_COMMON_CMAKE_ARGS} -DSIMDJSON_DEVELOPER_MODE=OFF
2593+
-DSIMDJSON_BUILD_STATIC_LIB=ON "-DCMAKE_INSTALL_PREFIX=${SIMDJSON_PREFIX}")
25932594

25942595
externalproject_add(simdjson_ep
25952596
${EP_COMMON_OPTIONS}
@@ -2604,7 +2605,8 @@ macro(build_simdjson)
26042605
if(NOT TARGET simdjson::simdjson)
26052606
add_library(simdjson::simdjson STATIC IMPORTED)
26062607
endif()
2607-
set_target_properties(simdjson::simdjson PROPERTIES IMPORTED_LOCATION "${SIMDJSON_STATIC_LIB}")
2608+
set_target_properties(simdjson::simdjson PROPERTIES IMPORTED_LOCATION
2609+
"${SIMDJSON_STATIC_LIB}")
26082610
target_include_directories(simdjson::simdjson INTERFACE "${SIMDJSON_INCLUDE_DIR}")
26092611
add_dependencies(simdjson::simdjson simdjson_ep)
26102612

@@ -2620,8 +2622,14 @@ if(ARROW_WITH_SIMDJSON)
26202622
# This ensures bundled simdjson headers are found BEFORE conda/system headers,
26212623
# which is necessary because conda environments add -isystem to CMAKE_CXX_FLAGS
26222624
# which would otherwise take precedence over our include_directories().
2623-
set(CMAKE_CXX_FLAGS "-isystem ${SIMDJSON_INCLUDE_DIR} ${CMAKE_CXX_FLAGS}")
2624-
set(CMAKE_C_FLAGS "-isystem ${SIMDJSON_INCLUDE_DIR} ${CMAKE_C_FLAGS}")
2625+
if(MSVC)
2626+
# MSVC uses /external:I for system include directories
2627+
set(CMAKE_CXX_FLAGS "/external:I ${SIMDJSON_INCLUDE_DIR} ${CMAKE_CXX_FLAGS}")
2628+
set(CMAKE_C_FLAGS "/external:I ${SIMDJSON_INCLUDE_DIR} ${CMAKE_C_FLAGS}")
2629+
else()
2630+
set(CMAKE_CXX_FLAGS "-isystem ${SIMDJSON_INCLUDE_DIR} ${CMAKE_CXX_FLAGS}")
2631+
set(CMAKE_C_FLAGS "-isystem ${SIMDJSON_INCLUDE_DIR} ${CMAKE_C_FLAGS}")
2632+
endif()
26252633
endif()
26262634

26272635
macro(build_xsimd)

‎cpp/src/arrow/extension/fixed_shape_tensor.cc‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@
1818
#include <numeric>
1919
#include <sstream>
2020

21-
// Ensure simdjson is used in header-only mode
22-
#ifndef SIMDJSON_HEADER_ONLY
23-
#define SIMDJSON_HEADER_ONLY
24-
#endif
2521
#include <simdjson.h>
2622

2723
#include "arrow/extension/fixed_shape_tensor.h"

‎cpp/src/arrow/extension/opaque.cc‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,6 @@
1919

2020
#include <sstream>
2121

22-
// Ensure simdjson is used in header-only mode
23-
#ifndef SIMDJSON_HEADER_ONLY
24-
#define SIMDJSON_HEADER_ONLY
25-
#endif
2622
#include <simdjson.h>
2723

2824
#include "arrow/json/json_util.h"

‎cpp/src/arrow/integration/json_integration.cc‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@
1717

1818
#include "arrow/integration/json_integration.h"
1919

20-
// Ensure simdjson is used in header-only mode
21-
#ifndef SIMDJSON_HEADER_ONLY
22-
#define SIMDJSON_HEADER_ONLY
23-
#endif
2420
#include <simdjson.h>
2521

2622
#include <cstddef>

‎cpp/src/arrow/integration/json_internal.cc‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@
1717

1818
#include "arrow/integration/json_internal.h"
1919

20-
// Ensure simdjson is used in header-only mode
21-
#ifndef SIMDJSON_HEADER_ONLY
22-
#define SIMDJSON_HEADER_ONLY
23-
#endif
2420
#include <simdjson.h>
2521

2622
#include <cstdint>

‎cpp/src/arrow/integration/json_internal.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@
2222
#include <string>
2323
#include <string_view>
2424

25-
// Ensure simdjson is used in header-only mode
26-
#ifndef SIMDJSON_HEADER_ONLY
27-
#define SIMDJSON_HEADER_ONLY
28-
#endif
2925
#include <simdjson.h>
3026

3127
#include "arrow/ipc/type_fwd.h"

‎cpp/src/arrow/json/chunker.cc‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@
2323
#include <utility>
2424
#include <vector>
2525

26-
// Ensure simdjson is used in header-only mode
27-
#ifndef SIMDJSON_HEADER_ONLY
28-
#define SIMDJSON_HEADER_ONLY
29-
#endif
3026
#include <simdjson.h>
3127

3228
#include "arrow/buffer.h"

‎cpp/src/arrow/json/from_string.cc‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,6 @@
4444
#include "arrow/util/logging_internal.h"
4545
#include "arrow/util/value_parsing.h"
4646

47-
// Ensure simdjson is used in header-only mode
48-
#ifndef SIMDJSON_HEADER_ONLY
49-
#define SIMDJSON_HEADER_ONLY
50-
#endif
5147
#include <simdjson.h>
5248

5349
namespace arrow {

‎cpp/src/arrow/json/json_util.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@
1717

1818
#pragma once
1919

20-
// Ensure simdjson is used in header-only mode
21-
#ifndef SIMDJSON_HEADER_ONLY
22-
#define SIMDJSON_HEADER_ONLY
23-
#endif
2420
#include <simdjson.h>
2521

2622
#include <cstdint>

‎cpp/src/arrow/json/object_parser.cc‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@
1717

1818
#include "arrow/json/object_parser.h"
1919

20-
// Ensure simdjson is used in header-only mode
21-
#ifndef SIMDJSON_HEADER_ONLY
22-
#define SIMDJSON_HEADER_ONLY
23-
#endif
2420
#include <simdjson.h>
2521

2622
namespace arrow {

0 commit comments

Comments
 (0)