Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
ambroff committed Jan 21, 2025
2 parents 3ab6a99 + 870c38c commit 6e476a5
Show file tree
Hide file tree
Showing 31 changed files with 498 additions and 33 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ jobs:
steps:

- name: Git checkout with submodules
uses: actions/checkout@v2
uses: actions/checkout@v4.1.1
with:
submodules: true

- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v5.1.0
with:
python-version: 3.8

Expand Down
23 changes: 9 additions & 14 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
steps:

- name: Git checkout
uses: actions/checkout@v2
uses: actions/checkout@v4.1.1

- name: Manual dispatch, get project name from input
if: github.event_name == 'workflow_dispatch'
Expand All @@ -40,7 +40,7 @@ jobs:
- name: Get changed files and save them to ${HOME}/files.json
if: github.event_name != 'workflow_dispatch'
id: files
uses: lots0logs/gh-action-get-changed-files@2.1.4
uses: lots0logs/gh-action-get-changed-files@2.2.2
with:
token: ${{ secrets.GITHUB_TOKEN }}

Expand All @@ -49,7 +49,7 @@ jobs:
run: |
MATRIX=`python .github/workflows/set_matrix.py`
if [ "${MATRIX}" ]; then
echo "::set-output name=matrix::${MATRIX}"
echo "matrix=${MATRIX}" >> $GITHUB_OUTPUT
else
exit 1
fi
Expand All @@ -70,12 +70,12 @@ jobs:
steps:

- name: Git checkout with submodules
uses: actions/checkout@v2
uses: actions/checkout@v4.1.1
with:
submodules: true

- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v5.1.0
with:
python-version: ${{ matrix.python }}

Expand All @@ -87,11 +87,6 @@ jobs:
if: runner.os == 'Windows'
run: echo "HUNTER_PYTHON_LOCATION=$env:pythonLocation" | Out-File -Append -FilePath $env:GITHUB_ENV -Encoding utf8

- name: Extract branch name
shell: bash
run: echo "##[set-output name=branch;]${GITHUB_REF#refs/heads/}"
id: extract_branch

- name: Build hunter_tests Unix
if: runner.os != 'Windows' && matrix.toolchain == 'hunter_tests'
env:
Expand All @@ -102,14 +97,14 @@ jobs:
- name: Build on Unix
if: runner.os != 'Windows' && matrix.toolchain != 'hunter_tests'
env:
BRANCH_NAME: ${{ steps.extract_branch.outputs.branch }}
BRANCH_NAME: ${{ github.ref_name }}
run: |
bash ${{ matrix.script }}
- name: Build on Windows
if: runner.os == 'Windows' && matrix.toolchain != 'hunter_tests'
env:
BRANCH_NAME: ${{ steps.extract_branch.outputs.branch }}
BRANCH_NAME: ${{ github.ref_name }}
run: |
${{ matrix.script }}
Expand All @@ -121,7 +116,7 @@ jobs:
steps:

- name: Git checkout
uses: actions/checkout@v2
uses: actions/checkout@v4.1.1

- name: Get job status via GitHub API
uses: octokit/[email protected]
Expand All @@ -138,7 +133,7 @@ jobs:
python .github/workflows/set_status.py
- name: Deploy job status to GitHub Pages
uses: peaceiris/actions-gh-pages@v3.7.0-8
uses: peaceiris/actions-gh-pages@v4.0.0
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: job_data
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci/build.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ set PATH=%PATH:C:\Program Files\Git\usr\bin;=%
:: Variable will be used in CMake so it's okay to use Unix style '/'
set HUNTER_GIT_EXECUTABLE=C:/Program Files/Git/bin/git.exe

set MINGW_PATH=C:\ProgramData\chocolatey\bin
set MINGW_PATH=C:\mingw64\bin

:: MSYS2 location
set MSYS_PATH=C:\msys64\usr\bin
Expand Down
38 changes: 26 additions & 12 deletions cmake/configs/default.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ include(hunter_user_error)

hunter_default_version(ARM_NEON_2_x86_SSE VERSION 1.0.0-p0)
hunter_default_version(AllTheFlopsThreads VERSION 0.1-p0)
hunter_default_version(Alut VERSION 1.1.0-469287b-p0)
hunter_default_version(Android-Apk VERSION 1.1.14)
hunter_default_version(Android-Build-Tools VERSION 27.0.3)
hunter_default_version(Android-Google-Repository VERSION 58)
Expand Down Expand Up @@ -46,7 +47,7 @@ hunter_default_version(BoringSSL VERSION 0.0.0-0f5ecd3a8-p0)
hunter_default_version(Box2D VERSION 2.3.1-p0)
hunter_default_version(CLAPACK VERSION 3.2.1)
hunter_default_version(CLI11 VERSION 2.3.2)
hunter_default_version(CURL VERSION 8.4.0-p0)
hunter_default_version(CURL VERSION 8.5.0-p0)
hunter_default_version(CapnProto VERSION 0.7.0)
hunter_default_version(Catch VERSION 2.13.9)
hunter_default_version(Clang VERSION 6.0.1-p0)
Expand All @@ -70,7 +71,7 @@ hunter_default_version(GSL VERSION 2.1.0-p2)
if(MSVC80)
hunter_default_version(GTest VERSION 1.7.0-hunter-6)
else()
hunter_default_version(GTest VERSION 1.14.0)
hunter_default_version(GTest VERSION 1.15.2)
endif()

hunter_default_version(HalideIR VERSION 0.0-32057b5-p0)
Expand Down Expand Up @@ -104,13 +105,19 @@ hunter_default_version(MySQL-client VERSION 6.1.9-p1)
hunter_default_version(NASM VERSION 2.15.02)
hunter_default_version(NLopt VERSION 2.5.0-p0)
hunter_default_version(ONNX VERSION 1.4.1-p0)
hunter_default_version(OpenAL VERSION 1.19.1)
hunter_default_version(OpenBLAS VERSION 0.3.21)
hunter_default_version(OpenAL VERSION 1.23.1)
hunter_default_version(OpenBLAS VERSION 0.3.27)
hunter_default_version(OpenCL VERSION 2022.01.04-p1)
hunter_default_version(OpenCL-Headers VERSION 2022.01.04)
hunter_default_version(OpenCL-cpp VERSION 2.0.16-61a5c9a-p0)
hunter_default_version(OpenCV VERSION 4.8.1-p0)
hunter_default_version(OpenCV-Extra VERSION 4.8.1)
if(MSVC)
hunter_default_version(OpenCV VERSION 4.10.0-p0)
hunter_default_version(OpenCV-Extra VERSION 4.10.0)
else()
# 4.10.0 has a build problem with TIFF header defines
hunter_default_version(OpenCV VERSION 4.8.1-p0)
hunter_default_version(OpenCV-Extra VERSION 4.8.1)
endif()
hunter_default_version(OpenEXR VERSION 3.1.5-p0)
hunter_default_version(OpenGL-Registry VERSION 0.0.0-d15191e-p0)
hunter_default_version(OpenNMTTokenizer VERSION 1.11.0-p1)
Expand Down Expand Up @@ -144,7 +151,7 @@ hunter_default_version(Qwt VERSION 6.1-p3)
hunter_default_version(RapidJSON VERSION 1.1.0-b557259-p0)
hunter_default_version(RapidXML VERSION 1.13)
hunter_default_version(RedisClient VERSION 0.6.1-p1)
hunter_default_version(SDL2 VERSION 2.24.0)
hunter_default_version(SDL2 VERSION 2.30.2)
hunter_default_version(SDL_image VERSION 2.0.5-p0)
hunter_default_version(SDL_mixer VERSION 2.0.4-p0)
hunter_default_version(SDL_net VERSION 2.2.0-p0)
Expand All @@ -156,7 +163,7 @@ hunter_default_version(SimpleSignal VERSION 0.0.0-79c3f68-p1)
hunter_default_version(Snappy VERSION 1.1.7)
hunter_default_version(Sober VERSION 0.1.3)
hunter_default_version(Sqlpp11 VERSION 0.57-p0)
hunter_default_version(SuiteSparse VERSION 5.4.0-2)
hunter_default_version(SuiteSparse VERSION 7.5.1-1)
hunter_default_version(TCLAP VERSION 1.2.2-p1)
hunter_default_version(TIFF VERSION 4.0.2-p5)
hunter_default_version(Tesseract VERSION 3.05.01-hunter-3)
Expand All @@ -175,7 +182,7 @@ hunter_default_version(ZMQPP VERSION 4.2.0-p0)
hunter_default_version(ZeroMQ VERSION 4.2.3-p1)
hunter_default_version(Zug VERSION 0.0.1-be20cae)

hunter_default_version(abseil VERSION 20230802.1)
hunter_default_version(abseil VERSION 20240116.2)
hunter_default_version(acf VERSION 0.1.14)
hunter_default_version(actionlib VERSION 1.11.13-p0)
hunter_default_version(aes VERSION 0.0.1-p1)
Expand Down Expand Up @@ -214,6 +221,7 @@ hunter_default_version(boost-pba VERSION 1.0.0-p0)
hunter_default_version(botan VERSION 2.11.0-110af9494)
hunter_default_version(braft VERSION 2018.10.23.1)
hunter_default_version(breakpad VERSION 0.0.0-12ecff3-p4)
hunter_default_version(brotli VERSION 1.0.9-p0)
hunter_default_version(brpc VERSION 2018.10.22.1)
hunter_default_version(bullet VERSION 2.87-p0)
hunter_default_version(byte-lite VERSION 0.3.0-p0)
Expand All @@ -229,7 +237,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_L
# - C++17 requirement: https://github.com/ceres-solver/ceres-solver/commit/1274743609bc59621adc9e311cdeeaad7eb65201
hunter_default_version(ceres-solver VERSION 2.1.0-p1)
else()
hunter_default_version(ceres-solver VERSION 2.2.0-p1)
hunter_default_version(ceres-solver VERSION 2.2.0-p2)
endif()
hunter_default_version(cgltf VERSION 1.10-f9a8804-p0)
hunter_default_version(check_ci_tag VERSION 1.0.0)
Expand Down Expand Up @@ -286,6 +294,7 @@ hunter_default_version(eos VERSION 0.12.1)
hunter_default_version(etc2comp VERSION 0.0.0-9cd0f9c-p0)
hunter_default_version(ethash VERSION 1.0.0)
hunter_default_version(eventpp VERSION 0.1.2-for-hunter-pm)
hunter_default_version(eyalroz_printf VERSION 6.2.0)
hunter_default_version(farmhash VERSION 1.1)
hunter_default_version(fast_obj VERSION 1.1-9255172-p0)
hunter_default_version(ffmpeg VERSION n4.1-dev-45499e557c-p7)
Expand Down Expand Up @@ -345,7 +354,12 @@ hunter_default_version(intltool VERSION 0.51.0)
hunter_default_version(intsizeof VERSION 2.0.2)
hunter_default_version(intx VERSION 0.9.0)
hunter_default_version(ios_sim VERSION 3.1.1)
hunter_default_version(ippicv VERSION 20230330)
if(MSVC)
hunter_default_version(ippicv VERSION 20240201)
else()
# see OpenCV for more info
hunter_default_version(ippicv VERSION 20230330)
endif()
hunter_default_version(iroha-ed25519 VERSION 2.0.0)
hunter_default_version(irrXML VERSION 1.2-p0)
hunter_default_version(ittapi VERSION 3.21.2-p0)
Expand Down Expand Up @@ -436,7 +450,7 @@ hunter_default_version(oniguruma VERSION 6.8.1-p0)
hunter_default_version(onmt VERSION 0.4.1-p2)
hunter_default_version(openddlparser VERSION 0.1.0-p2)
hunter_default_version(opentracing-cpp VERSION 1.6.0)
hunter_default_version(opusfile VERSION 0.12-p1)
hunter_default_version(opusfile VERSION 0.12-p2)
hunter_default_version(pcg VERSION 0.0.0-p1)
hunter_default_version(pciaccess VERSION 0.13.4)
hunter_default_version(pcre2 VERSION 10.13-p0)
Expand Down
2 changes: 1 addition & 1 deletion cmake/modules/hunter_setup_msvc.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ macro(hunter_setup_msvc)
string(COMPARE EQUAL "${MSVC_VERSION}" "1900" _vs_14_2015)
string(REGEX MATCH "^191[0-9]$" _vs_15_2017 "${MSVC_VERSION}")
string(REGEX MATCH "^192[0-9]$" _vs_16_2019 "${MSVC_VERSION}")
string(REGEX MATCH "^193[0-9]$" _vs_17_2022 "${MSVC_VERSION}")
string(REGEX MATCH "^19[34][0-9]$" _vs_17_2022 "${MSVC_VERSION}")

if(_vs_8_2005)
set(HUNTER_MSVC_VERSION "8")
Expand Down
27 changes: 27 additions & 0 deletions cmake/projects/Alut/hunter.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
include(hunter_add_version)
include(hunter_cacheable)
include(hunter_cmake_args)
include(hunter_download)
include(hunter_pick_scheme)

hunter_add_version(
PACKAGE_NAME
Alut
VERSION
1.1.0-469287b-p0
URL
"https://github.com/cpp-pm/freealut/archive/1.1.0-469287b-p0.tar.gz"
SHA1
c20f2c026bb48d9e6ade42051c998797b0b723b6
)

hunter_cmake_args(
Alut
CMAKE_ARGS
BUILD_EXAMPLES=OFF
BUILD_TESTS=OFF
)

hunter_pick_scheme(DEFAULT url_sha1_cmake)
hunter_cacheable(Alut)
hunter_download(PACKAGE_NAME Alut)
11 changes: 11 additions & 0 deletions cmake/projects/CURL/hunter.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,17 @@ hunter_add_version(
ff363d2ab97a46561216682c6295f436c61bec9d
)

hunter_add_version(
PACKAGE_NAME
CURL
VERSION
"8.5.0-p0"
URL
"https://github.com/cpp-pm/curl/archive/refs/tags/v8.5.0-p0.tar.gz"
SHA1
8fa4300089fef1977dc636c1d3923726a8a76372
)

if (ANDROID OR IOS OR RASPBERRY_PI OR OPENWRT)
set(_curl_cmake_args
HAVE_FSETXATTR_5=0
Expand Down
12 changes: 12 additions & 0 deletions cmake/projects/GTest/hunter.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,18 @@ hunter_add_version(
282808d544e2da6116b40772f75c438ec6dab181
)

hunter_add_version(
PACKAGE_NAME
GTest
VERSION
"1.15.2"
URL
"https://github.com/google/googletest/archive/v1.15.2.tar.gz"
SHA1
568d58e26bd4e838449ca7ab8ebc152b3cbd210d
)


if(HUNTER_GTest_VERSION VERSION_LESS 1.8.0 OR HUNTER_GTest_VERSION VERSION_GREATER_EQUAL 1.11.0)
set(_gtest_license "LICENSE")
else()
Expand Down
9 changes: 9 additions & 0 deletions cmake/projects/OpenAL/hunter.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,12 @@ hunter_add_version(
URL "https://github.com/kcat/openal-soft/archive/openal-soft-1.18.2.tar.gz"
SHA1 "f819c6720c4beead7653ebc35fbb2c287a8970fc")

hunter_add_version(
PACKAGE_NAME OpenAL
VERSION "1.23.1"
URL "https://github.com/kcat/openal-soft/archive/1.23.1.tar.gz"
SHA1 "db17e5ea24792b3fcbbb04d8f0b28e9d1e28ea7b")

set(_hunter_openal_cmake_args)
if(NOT BUILD_SHARED_LIBS)
set(
Expand All @@ -34,8 +40,11 @@ hunter_cmake_args(
ALSOFT_EXAMPLES=OFF
ALSOFT_TESTS=OFF
ALSOFT_CONFIG=OFF
ALSOFT_INSTALL_CONFIG=OFF
ALSOFT_HRTF_DEFS=OFF
ALSOFT_INSTALL_HRTF_DATA=OFF
ALSOFT_AMBDEC_PRESETS=OFF
ALSOFT_INSTALL_AMBDEC_PRESETS=OFF
ALSOFT_EMBED_HRTF_DATA=OFF
${_hunter_openal_cmake_args}
)
Expand Down
11 changes: 11 additions & 0 deletions cmake/projects/OpenBLAS/hunter.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,17 @@ hunter_add_version(
b052d196ad694b29302e074b3eb8cc66745f6e2f
)

hunter_add_version(
PACKAGE_NAME
OpenBLAS
VERSION
0.3.27
URL
"https://github.com/xianyi/OpenBLAS/archive/v0.3.27.tar.gz"
SHA1
a2fe037b96c3d7aae64d1a31b3362cfd8e89b8c6
)

hunter_configuration_types(OpenBLAS CONFIGURATION_TYPES Release)
if(HUNTER_OpenBLAS_VERSION VERSION_LESS 0.3.1)
hunter_pick_scheme(DEFAULT OpenBLAS)
Expand Down
11 changes: 11 additions & 0 deletions cmake/projects/OpenCV-Extra/hunter.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,17 @@ hunter_add_version(
111cca75f8f3dd7d840755d6fc3c488c2fe980ed
)

hunter_add_version(
PACKAGE_NAME
OpenCV-Extra
VERSION
"4.10.0"
URL
"https://github.com/opencv/opencv_contrib/archive/4.10.0.tar.gz"
SHA1
164afbd29e2ac741b1159e572d6f13abd66b6064
)


hunter_pick_scheme(DEFAULT url_sha1_unpack)
hunter_download(PACKAGE_NAME OpenCV-Extra)
11 changes: 11 additions & 0 deletions cmake/projects/OpenCV/hunter.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,17 @@ include(hunter_pick_scheme)

# List of versions here...

hunter_add_version(
PACKAGE_NAME
OpenCV
VERSION
"4.10.0-p0"
URL
"https://github.com/cpp-pm/opencv/archive/refs/tags/v4.10.0-p0.tar.gz"
SHA1
a1c036469148b5c9e2d29861612a7cbb2ed75a9d
)

hunter_add_version(
PACKAGE_NAME
OpenCV
Expand Down
Loading

0 comments on commit 6e476a5

Please sign in to comment.