Skip to content

Commit 3ac6a90

Browse files
qinling0210qinling0210
committed
Put minio-cpp to vcpkg
1 parent 72cd528 commit 3ac6a90

File tree

579 files changed

+15
-241277
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

579 files changed

+15
-241277
lines changed

‎benchmark/local_infinity/CMakeLists.txt‎

Lines changed: 9 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
find_package(miniocpp REQUIRED)
2+
13
# infinity benchmark
24
add_executable(infinity_benchmark
35
infinity_benchmark.cpp
@@ -22,12 +24,10 @@ target_link_libraries(infinity_benchmark
2224
Parquet::parquet_static
2325
Arrow::arrow_static
2426
${JEMALLOC_STATIC_LIB}
25-
miniocpp.a
27+
miniocpp::miniocpp
2628
pugixml::static
27-
curlpp_static
2829
unofficial::inih::libinih
2930
unofficial::inih::inireader
30-
libcurl_static
3131
OpenSSL::SSL
3232
OpenSSL::Crypto
3333
re2::re2
@@ -43,9 +43,6 @@ target_link_libraries(infinity_benchmark
4343
)
4444

4545
target_link_directories(infinity_benchmark PUBLIC "${CMAKE_BINARY_DIR}/lib")
46-
target_link_directories(infinity_benchmark PUBLIC "${CMAKE_BINARY_DIR}/third_party/minio-cpp/")
47-
target_link_directories(infinity_benchmark PUBLIC "${CMAKE_BINARY_DIR}/third_party/curlpp/")
48-
target_link_directories(infinity_benchmark PUBLIC "${CMAKE_BINARY_DIR}/third_party/curl/")
4946
target_link_directories(infinity_benchmark PUBLIC "${CMAKE_BINARY_DIR}/third_party/")
5047

5148
# ########################################
@@ -54,7 +51,6 @@ target_link_directories(infinity_benchmark PUBLIC "${CMAKE_BINARY_DIR}/third_par
5451
add_executable(knn_import_benchmark
5552
./knn/knn_import_benchmark.cpp
5653
)
57-
add_dependencies(knn_import_benchmark miniocpp)
5854

5955
target_include_directories(knn_import_benchmark PUBLIC "${CMAKE_SOURCE_DIR}/src")
6056
target_link_libraries(knn_import_benchmark
@@ -75,12 +71,10 @@ target_link_libraries(knn_import_benchmark
7571
Parquet::parquet_static
7672
Arrow::arrow_static
7773
${JEMALLOC_STATIC_LIB}
78-
miniocpp.a
74+
miniocpp::miniocpp
7975
pugixml::static
80-
curlpp_static
8176
unofficial::inih::libinih
8277
unofficial::inih::inireader
83-
libcurl_static
8478
OpenSSL::SSL
8579
OpenSSL::Crypto
8680
re2::re2
@@ -96,16 +90,12 @@ target_link_libraries(knn_import_benchmark
9690
)
9791

9892
target_link_directories(knn_import_benchmark PUBLIC "${CMAKE_BINARY_DIR}/lib")
99-
target_link_directories(knn_import_benchmark PUBLIC "${CMAKE_BINARY_DIR}/third_party/minio-cpp/")
100-
target_link_directories(knn_import_benchmark PUBLIC "${CMAKE_BINARY_DIR}/third_party/curlpp/")
101-
target_link_directories(knn_import_benchmark PUBLIC "${CMAKE_BINARY_DIR}/third_party/curl/")
10293
target_link_directories(knn_import_benchmark PUBLIC "${CMAKE_BINARY_DIR}/third_party/")
10394

10495
# query benchmark
10596
add_executable(knn_query_benchmark
10697
./knn/knn_query_benchmark.cpp
10798
)
108-
add_dependencies(knn_query_benchmark miniocpp)
10999

110100
target_include_directories(knn_query_benchmark PUBLIC "${CMAKE_SOURCE_DIR}/src")
111101
target_link_libraries(knn_query_benchmark
@@ -126,12 +116,10 @@ target_link_libraries(knn_query_benchmark
126116
libevent::core
127117
oatpp::oatpp
128118
${JEMALLOC_STATIC_LIB}
129-
miniocpp.a
119+
miniocpp::miniocpp
130120
pugixml::static
131-
curlpp_static
132121
unofficial::inih::libinih
133122
unofficial::inih::inireader
134-
libcurl_static
135123
OpenSSL::SSL
136124
OpenSSL::Crypto
137125
re2::re2
@@ -147,9 +135,6 @@ target_link_libraries(knn_query_benchmark
147135
)
148136

149137
target_link_directories(knn_query_benchmark PUBLIC "${CMAKE_BINARY_DIR}/lib")
150-
target_link_directories(knn_query_benchmark PUBLIC "${CMAKE_BINARY_DIR}/third_party/minio-cpp/")
151-
target_link_directories(knn_query_benchmark PUBLIC "${CMAKE_BINARY_DIR}/third_party/curlpp/")
152-
target_link_directories(knn_query_benchmark PUBLIC "${CMAKE_BINARY_DIR}/third_party/curl/")
153138
target_link_directories(knn_query_benchmark PUBLIC "${CMAKE_BINARY_DIR}/third_party/")
154139

155140
# ########################################
@@ -178,12 +163,10 @@ target_link_libraries(fulltext_benchmark
178163
Parquet::parquet_static
179164
Arrow::arrow_static
180165
${JEMALLOC_STATIC_LIB}
181-
miniocpp.a
166+
miniocpp::miniocpp
182167
pugixml::static
183-
curlpp_static
184168
unofficial::inih::libinih
185169
unofficial::inih::inireader
186-
libcurl_static
187170
OpenSSL::SSL
188171
OpenSSL::Crypto
189172
re2::re2
@@ -199,9 +182,6 @@ target_link_libraries(fulltext_benchmark
199182
)
200183

201184
target_link_directories(fulltext_benchmark PUBLIC "${CMAKE_BINARY_DIR}/lib")
202-
target_link_directories(fulltext_benchmark PUBLIC "${CMAKE_BINARY_DIR}/third_party/minio-cpp/")
203-
target_link_directories(fulltext_benchmark PUBLIC "${CMAKE_BINARY_DIR}/third_party/curlpp/")
204-
target_link_directories(fulltext_benchmark PUBLIC "${CMAKE_BINARY_DIR}/third_party/curl/")
205185
target_link_directories(fulltext_benchmark PUBLIC "${CMAKE_BINARY_DIR}/third_party/")
206186

207187
# ########################################
@@ -224,12 +204,10 @@ target_link_libraries(sparse_benchmark
224204
Parquet::parquet_static
225205
Arrow::arrow_static
226206
${JEMALLOC_STATIC_LIB}
227-
miniocpp.a
207+
miniocpp::miniocpp
228208
pugixml::static
229-
curlpp_static
230209
unofficial::inih::libinih
231210
unofficial::inih::inireader
232-
libcurl_static
233211
OpenSSL::SSL
234212
OpenSSL::Crypto
235213
re2::re2
@@ -245,9 +223,6 @@ target_link_libraries(sparse_benchmark
245223
)
246224

247225
target_link_directories(sparse_benchmark PUBLIC "${CMAKE_BINARY_DIR}/lib")
248-
target_link_directories(sparse_benchmark PUBLIC "${CMAKE_BINARY_DIR}/third_party/minio-cpp/")
249-
target_link_directories(sparse_benchmark PUBLIC "${CMAKE_BINARY_DIR}/third_party/curlpp/")
250-
target_link_directories(sparse_benchmark PUBLIC "${CMAKE_BINARY_DIR}/third_party/curl/")
251226
target_link_directories(sparse_benchmark PUBLIC "${CMAKE_BINARY_DIR}/third_party/")
252227

253228
add_executable(bmp_benchmark
@@ -273,12 +248,10 @@ target_link_libraries(bmp_benchmark
273248
Parquet::parquet_static
274249
Arrow::arrow_static
275250
${JEMALLOC_STATIC_LIB}
276-
miniocpp.a
251+
miniocpp::miniocpp
277252
pugixml::static
278-
curlpp_static
279253
unofficial::inih::libinih
280254
unofficial::inih::inireader
281-
libcurl_static
282255
OpenSSL::SSL
283256
OpenSSL::Crypto
284257
re2::re2
@@ -294,9 +267,6 @@ target_link_libraries(bmp_benchmark
294267
)
295268

296269
target_link_directories(bmp_benchmark PUBLIC "${CMAKE_BINARY_DIR}/lib")
297-
target_link_directories(bmp_benchmark PUBLIC "${CMAKE_BINARY_DIR}/third_party/minio-cpp/")
298-
target_link_directories(bmp_benchmark PUBLIC "${CMAKE_BINARY_DIR}/third_party/curlpp/")
299-
target_link_directories(bmp_benchmark PUBLIC "${CMAKE_BINARY_DIR}/third_party/curl/")
300270
target_link_directories(bmp_benchmark PUBLIC "${CMAKE_BINARY_DIR}/third_party/")
301271

302272
add_executable(hnsw_benchmark
@@ -322,12 +292,10 @@ target_link_libraries(hnsw_benchmark
322292
libevent::core
323293
oatpp::oatpp
324294
${JEMALLOC_STATIC_LIB}
325-
miniocpp.a
295+
miniocpp::miniocpp
326296
pugixml::static
327-
curlpp_static
328297
unofficial::inih::libinih
329298
unofficial::inih::inireader
330-
libcurl_static
331299
OpenSSL::SSL
332300
OpenSSL::Crypto
333301
re2::re2
@@ -343,9 +311,6 @@ target_link_libraries(hnsw_benchmark
343311
)
344312

345313
target_link_directories(hnsw_benchmark PUBLIC "${CMAKE_BINARY_DIR}/lib")
346-
target_link_directories(hnsw_benchmark PUBLIC "${CMAKE_BINARY_DIR}/third_party/minio-cpp/")
347-
target_link_directories(hnsw_benchmark PUBLIC "${CMAKE_BINARY_DIR}/third_party/curlpp/")
348-
target_link_directories(hnsw_benchmark PUBLIC "${CMAKE_BINARY_DIR}/third_party/curl/")
349314
target_link_directories(hnsw_benchmark PUBLIC "${CMAKE_BINARY_DIR}/third_party/")
350315

351316
# add_definitions(-march=native)

‎benchmark/remote_infinity/CMakeLists.txt‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
find_package(miniocpp REQUIRED)
12

23
# query benchmark
34
add_executable(remote_query_benchmark
@@ -9,9 +10,6 @@ add_executable(remote_query_benchmark
910
target_include_directories(remote_query_benchmark PUBLIC "${CMAKE_SOURCE_DIR}/src")
1011
target_include_directories(remote_query_benchmark PUBLIC "${CMAKE_SOURCE_DIR}/src/network/infinity_thrift")
1112
target_link_directories(remote_query_benchmark PUBLIC "${CMAKE_BINARY_DIR}/lib")
12-
target_link_directories(remote_query_benchmark PUBLIC "${CMAKE_BINARY_DIR}/third_party/minio-cpp/")
13-
target_link_directories(remote_query_benchmark PUBLIC "${CMAKE_BINARY_DIR}/third_party/curlpp/")
14-
target_link_directories(remote_query_benchmark PUBLIC "${CMAKE_BINARY_DIR}/third_party/curl/")
1513
target_link_directories(remote_query_benchmark PUBLIC "${CMAKE_BINARY_DIR}/third_party/")
1614

1715
target_link_libraries(
@@ -32,15 +30,13 @@ target_link_libraries(
3230
Parquet::parquet_static
3331
Arrow::arrow_static
3432
${JEMALLOC_STATIC_LIB}
35-
miniocpp.a
33+
miniocpp::miniocpp
3634
re2::re2
3735
absl::any absl::log absl::base absl::bits
3836
PCRE2::8BIT
3937
pugixml::static
40-
curlpp_static
4138
unofficial::inih::libinih
4239
unofficial::inih::inireader
43-
libcurl_static
4440
OpenSSL::SSL
4541
OpenSSL::Crypto
4642
RocksDB::rocksdb

‎src/CMakeLists.txt‎

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -309,9 +309,6 @@ target_include_directories(infinity_core PUBLIC "${CMAKE_SOURCE_DIR}/third_party
309309
target_include_directories(infinity_core PUBLIC "${CMAKE_SOURCE_DIR}/third_party/base64/include")
310310
target_include_directories(infinity_core PUBLIC "${CMAKE_SOURCE_DIR}/third_party/eigen-3.4.0")
311311
target_include_directories(infinity_core PUBLIC "${CMAKE_SOURCE_DIR}/third_party/opencc")
312-
target_include_directories(infinity_core PUBLIC "${CMAKE_SOURCE_DIR}/third_party/minio-cpp/include")
313-
target_include_directories(infinity_core PUBLIC "${CMAKE_SOURCE_DIR}/third_party/curlpp/include")
314-
target_include_directories(infinity_core PUBLIC "${CMAKE_SOURCE_DIR}/third_party/curl/include")
315312
target_include_directories(infinity_core PUBLIC "${CMAKE_SOURCE_DIR}/third_party/darts/")
316313

317314
add_executable(infinity
@@ -327,7 +324,7 @@ add_executable(infinity
327324
### Parser (built after infinity_core so it can access modules)
328325
add_subdirectory(parser)
329326

330-
add_dependencies(infinity miniocpp curlpp_static libcurl_static)
327+
find_package(miniocpp REQUIRED)
331328

332329
target_link_libraries(infinity
333330
PUBLIC
@@ -348,13 +345,10 @@ target_link_libraries(infinity
348345
Parquet::parquet_static
349346
Arrow::arrow_static
350347
${JEMALLOC_STATIC_LIB}
351-
miniocpp.a
352-
# miniocpp::miniocpp
348+
miniocpp::miniocpp
353349
pugixml::static
354-
curlpp_static
355350
unofficial::inih::libinih
356351
unofficial::inih::inireader
357-
libcurl_static
358352
OpenSSL::SSL
359353
OpenSSL::Crypto
360354
re2::re2
@@ -372,9 +366,6 @@ target_link_libraries(infinity
372366
${STDCXX15EXP_STATIC}
373367
)
374368
target_link_directories(infinity PUBLIC "${CMAKE_BINARY_DIR}/lib")
375-
target_link_directories(infinity PUBLIC "${CMAKE_BINARY_DIR}/third_party/minio-cpp/")
376-
target_link_directories(infinity PUBLIC "${CMAKE_BINARY_DIR}/third_party/curlpp/")
377-
target_link_directories(infinity PUBLIC "${CMAKE_BINARY_DIR}/third_party/curl/")
378369
target_link_directories(infinity PUBLIC "${CMAKE_BINARY_DIR}/third_party/")
379370

380371
target_include_directories(infinity PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
@@ -488,7 +479,6 @@ target_sources(unit_test
488479
)
489480

490481
set_target_properties(unit_test PROPERTIES OUTPUT_NAME test_main)
491-
add_dependencies(unit_test miniocpp curlpp_static libcurl_static)
492482

493483
target_link_libraries(unit_test
494484
infinity_core
@@ -508,13 +498,10 @@ target_link_libraries(unit_test
508498
Parquet::parquet_static
509499
Arrow::arrow_static
510500
${JEMALLOC_STATIC_LIB}
511-
miniocpp.a
512-
# miniocpp::miniocpp
501+
miniocpp::miniocpp
513502
pugixml::static
514-
curlpp_static
515503
unofficial::inih::libinih
516504
unofficial::inih::inireader
517-
libcurl_static
518505
OpenSSL::SSL
519506
OpenSSL::Crypto
520507
re2::re2
@@ -539,9 +526,6 @@ target_compile_options(unit_test PRIVATE
539526
)
540527

541528
target_link_directories(unit_test PUBLIC "${CMAKE_BINARY_DIR}/lib")
542-
target_link_directories(unit_test PUBLIC "${CMAKE_BINARY_DIR}/third_party/minio-cpp/")
543-
target_link_directories(unit_test PUBLIC "${CMAKE_BINARY_DIR}/third_party/curlpp/")
544-
target_link_directories(unit_test PUBLIC "${CMAKE_BINARY_DIR}/third_party/curl/")
545529
target_link_directories(unit_test PUBLIC "${CMAKE_BINARY_DIR}/third_party/")
546530

547531
target_include_directories(unit_test PUBLIC "${CMAKE_SOURCE_DIR}/unit_test")

‎third_party/CMakeLists.txt‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,3 @@ add_subdirectory(ijma)
2929
add_subdirectory(opencc)
3030
#endif ()
3131

32-
add_subdirectory(minio-cpp)
33-
add_subdirectory(curlpp)
34-
35-
add_subdirectory(curl)
36-

‎third_party/curl/CMake/CMakeConfigurableFile.in‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

0 commit comments

Comments
 (0)