cmake

Author: rok

cpp/cmake_modules/ThirdpartyToolchain.cmake

@@ -2632,11 +2632,14 @@ if(ARROW_WITH_SIMDJSON)
   # Note: simdjson is a private dependency - it's linked into libarrow
   # and doesn't need to be exposed to downstream consumers.
 
-  # On Windows, force header-only mode for simdjson to avoid linking issues
-  # with vcpkg-provided simdjson. We add SIMDJSON_HEADER_ONLY to the target's
-  # interface compile definitions so all consumers get it automatically.
-  if(WIN32 AND TARGET simdjson::simdjson)
-    message(STATUS "Windows detected with simdjson target - forcing header-only mode")
+  # When using vcpkg-provided simdjson, force header-only mode to avoid linking
+  # issues. vcpkg's simdjson package provides a stub static library that expects
+  # consumers to use header-only mode. This applies to all platforms, not just
+  # Windows. We detect vcpkg by checking for VCPKG_TARGET_TRIPLET.
+  # We add SIMDJSON_HEADER_ONLY to the target's interface compile definitions
+  # so all consumers get it automatically.
+  if(VCPKG_TARGET_TRIPLET AND TARGET simdjson::simdjson)
+    message(STATUS "vcpkg detected with simdjson target - forcing header-only mode")
     message(STATUS "  SIMDJSON_VENDORED=${SIMDJSON_VENDORED}")
     get_target_property(_simdjson_type simdjson::simdjson TYPE)
     message(STATUS "  simdjson target type: ${_simdjson_type}")

cpp/src/arrow/CMakeLists.txt

@@ -1078,18 +1078,10 @@ if(ARROW_JSON)
                            json/parser.cc
                            json/reader.cc
                            ${ARROW_SIMDJSON_IMPL_SRC})
-  message(STATUS "ARROW_JSON: ARROW_JSON_TARGETS=${ARROW_JSON_TARGETS}")
-  message(STATUS "ARROW_JSON: ARROW_SIMDJSON_HEADER_ONLY=${ARROW_SIMDJSON_HEADER_ONLY}")
   foreach(ARROW_JSON_TARGET ${ARROW_JSON_TARGETS})
-    message(STATUS "ARROW_JSON: Processing target ${ARROW_JSON_TARGET}")
     target_link_libraries(${ARROW_JSON_TARGET} PRIVATE simdjson::simdjson)
-    # When in header-only mode, we need SIMDJSON_HEADER_ONLY defined for ALL files
-    # that include simdjson headers (not just the implementation file).
-    # The INTERFACE_COMPILE_DEFINITIONS from simdjson::simdjson should propagate this,
-    # but some vcpkg configurations have a static library with header-only interface
-    # definitions, which doesn't propagate correctly. Adding explicitly ensures it works.
+    # Add SIMDJSON_HEADER_ONLY when in header-only mode
     if(ARROW_SIMDJSON_HEADER_ONLY)
-      message(STATUS "ARROW_JSON: Adding SIMDJSON_HEADER_ONLY to ${ARROW_JSON_TARGET}")
       target_compile_definitions(${ARROW_JSON_TARGET} PRIVATE SIMDJSON_HEADER_ONLY)
     endif()
   endforeach()