Skip to content

Commit 5ee7a89

Browse files
committed
GH-35460: Fix CI workflows
1 parent 5fa90ca commit 5ee7a89

4 files changed

Lines changed: 10 additions & 6 deletions

File tree

ci/conda_env_cpp.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ pkg-config
4545
python
4646
rapidjson
4747
re2
48+
simdjson
4849
snappy
4950
thrift-cpp>=0.11.0
5051
xsimd>=14.2

ci/vcpkg/vcpkg.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,7 @@
5757
"json": {
5858
"description": "JSON support",
5959
"dependencies": [
60-
"rapidjson"
61-
]
62-
},
63-
"simdjson": {
64-
"description": "Optimized SIMD JSON parsing support",
65-
"dependencies": [
60+
"rapidjson",
6661
"simdjson"
6762
]
6863
},

cpp/cmake_modules/FindsimdjsonAlt.cmake

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,4 +96,11 @@ if(simdjson_FOUND)
9696
add_library(simdjson::simdjson ALIAS simdjson)
9797
endif()
9898
endif()
99+
100+
if(WIN32 AND BUILD_SHARED_LIBS AND TARGET simdjson::simdjson)
101+
target_compile_definitions(
102+
simdjson::simdjson
103+
INTERFACE SIMDJSON_USING_WINDOWS_DYNAMIC_LIBRARY=1
104+
)
105+
endif()
99106
endif()

cpp/vcpkg.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
"protobuf",
4949
"rapidjson",
5050
"re2",
51+
"simdjson",
5152
"snappy",
5253
"sqlite3",
5354
"thrift",

0 commit comments

Comments
 (0)