Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

238, part 4: add minio-cpp (temporary builds until a new release) #265

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
594361f
Fix examples build and bug in downsampling.
aliddell Jul 5, 2024
c78ac50
Use x64 triplet for Mac build and release.
aliddell Jul 5, 2024
8fd11e7
Revert "Use x64 triplet for Mac build and release."
aliddell Jul 5, 2024
3235279
build on PR (temporarily)
aliddell Jul 5, 2024
13ce335
Try to merge x64 and arm64 libraries into universal binaries.
aliddell Jul 5, 2024
413012e
Stop messing with the mac build for now.
aliddell Jul 5, 2024
dce9d22
Separate common classes and utilities. Fix includes. Move tests.
aliddell Jul 5, 2024
691491d
Add `thread_pool__push_to_job_queue` to list of unit tests to run.
aliddell Jul 5, 2024
0259492
Merge branch '238-implement-s3-sinks-pt-2' into 238-implement-s3-sink…
aliddell Jul 5, 2024
68704cb
Restore -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64"
aliddell Jul 5, 2024
9e30a3f
Merge branch '238-implement-s3-sinks-pt-2' into 238-implement-s3-sink…
aliddell Jul 5, 2024
2ab657a
add minio-cpp
aliddell Jul 6, 2024
fc90d8e
Use universal binaries
aliddell Jul 6, 2024
6999e77
add note to CMakeLists.txt
aliddell Jul 6, 2024
4ac9eb5
Fix bug in test_average_frame_inner
aliddell Jul 6, 2024
7ed4c6a
Merge branch '238-implement-s3-sinks-pt-2' into 238-implement-s3-sink…
aliddell Jul 6, 2024
df8a50f
Merge branch '238-implement-s3-sinks-pt-3' into 238-implement-s3-sink…
aliddell Jul 6, 2024
f6c5c5e
Merge remote-tracking branch 'upstream/main' into 238-implement-s3-si…
aliddell Jul 8, 2024
037d6ec
Add a separate macros-only header.
aliddell Jul 9, 2024
fbc1094
Trim whitespace from dimension names.
aliddell Jul 9, 2024
a4c1442
Merge remote-tracking branch 'upstream/main' into 238-implement-s3-si…
aliddell Jul 9, 2024
eef0db7
Use a `switch` statement in `common::sample_type_to_string()`.
aliddell Jul 9, 2024
1377ed4
Respond to PR comments.
aliddell Jul 9, 2024
9736225
Merge branch '238-implement-s3-sinks-pt-3' into 238-implement-s3-sink…
aliddell Jul 9, 2024
b2b10ee
Merge remote-tracking branch 'upstream/main' into 238-implement-s3-si…
aliddell Jul 10, 2024
9835f66
Timeout after 20 minutes instead of 10. Remove Automerge job.
aliddell Jul 10, 2024
01ed5ce
Merge remote-tracking branch 'upstream/main' into 238-implement-s3-si…
aliddell Jul 11, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
test:
name: ${{ matrix.platform }}
runs-on: ${{ matrix.platform }}
timeout-minutes: 10
timeout-minutes: 20
strategy:
fail-fast: false
matrix:
Expand Down
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ enable_testing()

find_package(nlohmann_json CONFIG REQUIRED)
find_package(blosc CONFIG REQUIRED)
#find_package(miniocpp CONFIG REQUIRED) # TODO (aliddell): revert when minio-cpp is fixed

include(cmake/aq_require.cmake)
include(cmake/git-versioning.cmake)
Expand Down
1 change: 1 addition & 0 deletions src/3rdParty/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
add_subdirectory(minio-cpp)
50 changes: 50 additions & 0 deletions src/3rdParty/minio-cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
set(pwd ${CMAKE_CURRENT_LIST_DIR})

set(lib "unknown-minio-cpp-lib")

if(WIN32)
set(lib "${pwd}/lib/win64/miniocpp.lib")
set(libd "${pwd}/lib/win64/miniocpp-debug.lib")
elseif(APPLE)
set(lib "${pwd}/lib/osx/libminiocpp.a")
set(libd "${pwd}/lib/osx/libminiocpp-debug.a")
elseif(LINUX)
set(lib "${pwd}/lib/linux-amd64/libminiocpp.a")
set(libd "${pwd}/lib/linux-amd64/libminiocpp-debug.a")
endif()

# Dependencies
# ------------

find_package(OpenSSL REQUIRED)
find_package(unofficial-curlpp CONFIG REQUIRED)
find_package(unofficial-inih CONFIG REQUIRED)
find_package(nlohmann_json CONFIG REQUIRED)
find_package(pugixml CONFIG REQUIRED)
find_package(ZLIB REQUIRED)

list(APPEND MINIO_CPP_LIBS
unofficial::curlpp::curlpp
unofficial::inih::inireader
nlohmann_json::nlohmann_json
pugixml
OpenSSL::SSL OpenSSL::Crypto
ZLIB::ZLIB
)

if (WIN32)
list(APPEND MINIO_CPP_LIBS wsock32)
list(APPEND MINIO_CPP_LIBS ws2_32)
endif()

# ------------

message(STATUS "minio-cpp: ${pwd}")
set(tgt miniocpp::miniocpp)
add_library(${tgt} STATIC IMPORTED GLOBAL)
target_include_directories(${tgt} INTERFACE ${pwd}/inc)
target_link_libraries(${tgt} INTERFACE ${MINIO_CPP_LIBS})
set_target_properties(${tgt} PROPERTIES
IMPORTED_LOCATION ${lib}
IMPORTED_LOCATION_DEBUG ${libd}
)
5 changes: 5 additions & 0 deletions src/3rdParty/minio-cpp/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# MinIO C++ client

This repository includes headers and pre-build binaries for the MinIO C++ client SDK.
It was built from
commit [0352bb3a5b77458d1c816d314d891b96a4d4c58b](https://github.com/minio/minio-cpp/tree/0352bb3a5b77458d1c816d314d891b96a4d4c58b).
Loading
Loading