cmake and lint

rok · rok · commit 34e20196a703 · 2026-01-28T11:39:46.000+01:00
diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -2584,12 +2584,13 @@ macro(build_simdjson)
   message(STATUS "simdjson: Building from source")
   set(SIMDJSON_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/simdjson_ep/src/simdjson_ep-install")
   set(SIMDJSON_INCLUDE_DIR "${SIMDJSON_PREFIX}/include")
-  set(SIMDJSON_STATIC_LIB "${SIMDJSON_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}simdjson${CMAKE_STATIC_LIBRARY_SUFFIX}")
+  set(SIMDJSON_STATIC_LIB
+      "${SIMDJSON_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}simdjson${CMAKE_STATIC_LIBRARY_SUFFIX}"
+  )
 
-  set(SIMDJSON_CMAKE_ARGS ${EP_COMMON_CMAKE_ARGS}
-                          -DSIMDJSON_DEVELOPER_MODE=OFF
-                          -DSIMDJSON_BUILD_STATIC_LIB=ON
-                          "-DCMAKE_INSTALL_PREFIX=${SIMDJSON_PREFIX}")
+  set(SIMDJSON_CMAKE_ARGS
+      ${EP_COMMON_CMAKE_ARGS} -DSIMDJSON_DEVELOPER_MODE=OFF
+      -DSIMDJSON_BUILD_STATIC_LIB=ON "-DCMAKE_INSTALL_PREFIX=${SIMDJSON_PREFIX}")
 
   externalproject_add(simdjson_ep
                       ${EP_COMMON_OPTIONS}
@@ -2604,7 +2605,8 @@ macro(build_simdjson)
   if(NOT TARGET simdjson::simdjson)
     add_library(simdjson::simdjson STATIC IMPORTED)
   endif()
-  set_target_properties(simdjson::simdjson PROPERTIES IMPORTED_LOCATION "${SIMDJSON_STATIC_LIB}")
+  set_target_properties(simdjson::simdjson PROPERTIES IMPORTED_LOCATION
+                                                      "${SIMDJSON_STATIC_LIB}")
   target_include_directories(simdjson::simdjson INTERFACE "${SIMDJSON_INCLUDE_DIR}")
   add_dependencies(simdjson::simdjson simdjson_ep)
 
diff --git a/cpp/src/arrow/extension/fixed_shape_tensor.cc b/cpp/src/arrow/extension/fixed_shape_tensor.cc
@@ -18,10 +18,6 @@
 #include <numeric>
 #include <sstream>
 
-// Ensure simdjson is used in header-only mode
-#ifndef SIMDJSON_HEADER_ONLY
-#define SIMDJSON_HEADER_ONLY
-#endif
 #include <simdjson.h>
 
 #include "arrow/extension/fixed_shape_tensor.h"
diff --git a/cpp/src/arrow/extension/opaque.cc b/cpp/src/arrow/extension/opaque.cc
@@ -19,10 +19,6 @@
 
 #include <sstream>
 
-// Ensure simdjson is used in header-only mode
-#ifndef SIMDJSON_HEADER_ONLY
-#define SIMDJSON_HEADER_ONLY
-#endif
 #include <simdjson.h>
 
 #include "arrow/json/json_util.h"
diff --git a/cpp/src/arrow/integration/json_integration.cc b/cpp/src/arrow/integration/json_integration.cc
@@ -17,10 +17,6 @@
 
 #include "arrow/integration/json_integration.h"
 
-// Ensure simdjson is used in header-only mode
-#ifndef SIMDJSON_HEADER_ONLY
-#define SIMDJSON_HEADER_ONLY
-#endif
 #include <simdjson.h>
 
 #include <cstddef>
diff --git a/cpp/src/arrow/integration/json_internal.cc b/cpp/src/arrow/integration/json_internal.cc
@@ -17,10 +17,6 @@
 
 #include "arrow/integration/json_internal.h"
 
-// Ensure simdjson is used in header-only mode
-#ifndef SIMDJSON_HEADER_ONLY
-#define SIMDJSON_HEADER_ONLY
-#endif
 #include <simdjson.h>
 
 #include <cstdint>
diff --git a/cpp/src/arrow/integration/json_internal.h b/cpp/src/arrow/integration/json_internal.h
@@ -22,10 +22,6 @@
 #include <string>
 #include <string_view>
 
-// Ensure simdjson is used in header-only mode
-#ifndef SIMDJSON_HEADER_ONLY
-#define SIMDJSON_HEADER_ONLY
-#endif
 #include <simdjson.h>
 
 #include "arrow/ipc/type_fwd.h"
diff --git a/cpp/src/arrow/json/chunker.cc b/cpp/src/arrow/json/chunker.cc
@@ -23,10 +23,6 @@
 #include <utility>
 #include <vector>
 
-// Ensure simdjson is used in header-only mode
-#ifndef SIMDJSON_HEADER_ONLY
-#define SIMDJSON_HEADER_ONLY
-#endif
 #include <simdjson.h>
 
 #include "arrow/buffer.h"
diff --git a/cpp/src/arrow/json/from_string.cc b/cpp/src/arrow/json/from_string.cc
@@ -44,10 +44,6 @@
 #include "arrow/util/logging_internal.h"
 #include "arrow/util/value_parsing.h"
 
-// Ensure simdjson is used in header-only mode
-#ifndef SIMDJSON_HEADER_ONLY
-#define SIMDJSON_HEADER_ONLY
-#endif
 #include <simdjson.h>
 
 namespace arrow {
diff --git a/cpp/src/arrow/json/json_util.h b/cpp/src/arrow/json/json_util.h
@@ -17,10 +17,6 @@
 
 #pragma once
 
-// Ensure simdjson is used in header-only mode
-#ifndef SIMDJSON_HEADER_ONLY
-#define SIMDJSON_HEADER_ONLY
-#endif
 #include <simdjson.h>
 
 #include <cstdint>
diff --git a/cpp/src/arrow/json/object_parser.cc b/cpp/src/arrow/json/object_parser.cc
@@ -17,10 +17,6 @@
 
 #include "arrow/json/object_parser.h"
 
-// Ensure simdjson is used in header-only mode
-#ifndef SIMDJSON_HEADER_ONLY
-#define SIMDJSON_HEADER_ONLY
-#endif
 #include <simdjson.h>
 
 namespace arrow {
diff --git a/cpp/src/arrow/json/parser.cc b/cpp/src/arrow/json/parser.cc
@@ -15,11 +15,6 @@
 // specific language governing permissions and limitations
 // under the License.
 
-// Ensure simdjson is used in header-only mode
-#ifndef SIMDJSON_HEADER_ONLY
-#define SIMDJSON_HEADER_ONLY
-#endif
-
 // Debug: Check simdjson mode when compiling parser.cc
 #if defined(SIMDJSON_USING_LIBRARY)
 #  pragma message("parser.cc: SIMDJSON_USING_LIBRARY - linking against library")
diff --git a/cpp/src/arrow/json/test_common.h b/cpp/src/arrow/json/test_common.h
@@ -25,10 +25,6 @@
 #include <utility>
 #include <vector>
 
-// Ensure simdjson is used in header-only mode
-#ifndef SIMDJSON_HEADER_ONLY
-#define SIMDJSON_HEADER_ONLY
-#endif
 #include <simdjson.h>
 
 #include "arrow/array.h"
diff --git a/cpp/src/arrow/testing/gtest_util.cc b/cpp/src/arrow/testing/gtest_util.cc
@@ -67,10 +67,6 @@
 #include "arrow/util/thread_pool.h"
 #include "arrow/util/windows_compatibility.h"
 
-// Ensure simdjson is used in header-only mode
-#ifndef SIMDJSON_HEADER_ONLY
-#define SIMDJSON_HEADER_ONLY
-#endif
 #include <simdjson.h>
 
 namespace arrow {
diff --git a/cpp/src/parquet/geospatial/util_json_internal.cc b/cpp/src/parquet/geospatial/util_json_internal.cc
@@ -19,10 +19,6 @@
 
 #include <string>
 
-// Ensure simdjson is used in header-only mode
-#ifndef SIMDJSON_HEADER_ONLY
-#define SIMDJSON_HEADER_ONLY
-#endif
 #include <simdjson.h>
 
 #include "arrow/extension_type.h"
diff --git a/cpp/src/parquet/reader_test.cc b/cpp/src/parquet/reader_test.cc
@@ -27,10 +27,6 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-// Ensure simdjson is used in header-only mode
-#ifndef SIMDJSON_HEADER_ONLY
-#define SIMDJSON_HEADER_ONLY
-#endif
 #include <simdjson.h>
 
 #include "arrow/array.h"
