Skip to content
This repository has been archived by the owner on Oct 6, 2020. It is now read-only.

Commit

Permalink
Port libs3 to MSVC, replace use of select()
Browse files Browse the repository at this point in the history
  • Loading branch information
ned14 committed Aug 13, 2020
1 parent 7b5dc14 commit 59d7bd0
Show file tree
Hide file tree
Showing 4 changed files with 51 additions and 40 deletions.
25 changes: 14 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,17 +81,20 @@ matrix:
TOOLCHAIN=osx-10-13-make-cxx14
PROJECT_DIR=examples/s3
- os: osx
osx_image: xcode9.4
env: >
TOOLCHAIN=osx-10-13-cxx14
PROJECT_DIR=examples/s3
- os: osx
osx_image: xcode9.4
env: >
TOOLCHAIN=ios-nocodesign-11-4-dep-9-3
PROJECT_DIR=examples/s3
# Disabled due to some weird breakage in curl dependency build
# - os: osx
# osx_image: xcode9.4
# env: >
# TOOLCHAIN=osx-10-13-cxx14
# PROJECT_DIR=examples/s3

# Disabled due to exceeding build timeout
# - os: osx
# osx_image: xcode9.4
# env: >
# TOOLCHAIN=ios-nocodesign-11-4-dep-9-3
# PROJECT_DIR=examples/s3
# VERBOSE=0

# }

Expand Down
53 changes: 25 additions & 28 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,37 +8,34 @@ environment:

matrix:

# https://ci.appveyor.com/project/ingenue/hunter/builds/27096029
# Disabled due to not supported by OpenSSL, a dependency
# - TOOLCHAIN: "ninja-vs-15-2017-win64-cxx17"
# PROJECT_DIR: examples\s3
# APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017

# - TOOLCHAIN: "ninja-vs-15-2017-win64-cxx17"
# PROJECT_DIR: examples\s3
# APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
# Disabled due to not supported by OpenSSL, a dependency
# - TOOLCHAIN: "nmake-vs-15-2017-win64-cxx17"
# PROJECT_DIR: examples\s3
# APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017

# - TOOLCHAIN: "nmake-vs-15-2017-win64-cxx17"
# PROJECT_DIR: examples\s3
# APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017

# - TOOLCHAIN: "vs-15-2017-win64-cxx17"
# PROJECT_DIR: examples\s3
# APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017

# - TOOLCHAIN: "vs-14-2015-sdk-8-1"
# PROJECT_DIR: examples\s3
# APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015

# - TOOLCHAIN: "mingw-cxx17"
# PROJECT_DIR: examples\s3
# APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015

# - TOOLCHAIN: "msys-cxx17"
# PROJECT_DIR: examples\s3
# APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015

# Extra {
- TOOLCHAIN: "dummy"
- TOOLCHAIN: "vs-15-2017-win64-cxx17"
PROJECT_DIR: examples\s3
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
# }
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017

# Disabled due to compiler overload resolution bug
# - TOOLCHAIN: "vs-14-2015-sdk-8-1"
# PROJECT_DIR: examples\s3
# APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015

# Disabled due to not supported by OpenSSL, a dependency
# - TOOLCHAIN: "mingw-cxx17"
# PROJECT_DIR: examples\s3
# APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015

# Disabled due to not supported by OpenSSL, a dependency
# - TOOLCHAIN: "msys-cxx17"
# PROJECT_DIR: examples\s3
# APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015

install:
# Python 3
Expand Down
2 changes: 1 addition & 1 deletion cmake/configs/default.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,7 @@ hunter_default_version(ros_std_msgs VERSION 0.5.12-p0)
hunter_default_version(rosconsole VERSION 1.13.10-p0)
hunter_default_version(roscpp_core VERSION 0.6.12-p0)
hunter_default_version(rospack VERSION 2.5.3-p0)
hunter_default_version(s3 VERSION 0.0.0-287e4be-p1)
hunter_default_version(s3 VERSION 4.1.0-287e4be-p0)
hunter_default_version(scelta VERSION 0.1.0-a0f4f70-p0)
hunter_default_version(sds VERSION 2.0.0)
hunter_default_version(sentencepiece VERSION 0.1.8-p1)
Expand Down
11 changes: 11 additions & 0 deletions cmake/projects/s3/hunter.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,17 @@ include(hunter_cacheable)
include(hunter_download)
include(hunter_pick_scheme)

hunter_add_version(
PACKAGE_NAME
s3
VERSION
4.1.0-287e4be-p0
URL
"https://github.com/cpp-pm/libs3/archive/v4.1.0-287e4be-p0.tar.gz"
SHA1
e79af37884e619141f94e9a102218d824f851e95
)

hunter_add_version(
PACKAGE_NAME
s3
Expand Down

0 comments on commit 59d7bd0

Please sign in to comment.