Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into incubator
Browse files Browse the repository at this point in the history
  • Loading branch information
ambroff committed Dec 7, 2023
2 parents 33b6d07 + a768595 commit 8cb4411
Show file tree
Hide file tree
Showing 686 changed files with 1,664 additions and 1,185 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ assignees: ''
```cmake
# CMakeLists.txt
cmake_minimum_required(VERSION 3.2)
cmake_minimum_required(VERSION 3.5)
include("cmake/HunterGate.cmake")
HunterGate(
Expand Down
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

* I've checked this [Git style guide](https://0.readthedocs.io/en/latest/git.html). **[Yes|No]**
* I've checked this [CMake style guide](https://0.readthedocs.io/en/latest/cmake.html). **[Yes|No]**
* My change will work with CMake 3.2 (minimum requirement for Hunter). **[Yes|No]**
* My change will work with CMake 3.5 (minimum requirement for Hunter). **[Yes|No]**
* I will try to keep this pull request as small as possible and will try not to mix unrelated features. **[Yes|No]**

---
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/ci/matrix.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
{ "example": "foo", "toolchain": "sanitize-address-cxx17", "os": "ubuntu-20.04", "python": "3.8", "script": "build.sh" },
{ "example": "foo", "toolchain": "sanitize-leak-cxx17", "os": "ubuntu-20.04", "python": "3.8", "script": "build.sh" },
{ "example": "foo", "toolchain": "sanitize-thread-cxx17", "os": "ubuntu-20.04", "python": "3.8", "script": "build.sh" },
{ "example": "foo", "toolchain": "osx-10-15-make-cxx14", "os": "macos-10.15", "python": "3.8", "script": "build.sh" },
{ "example": "foo", "toolchain": "osx-12-3-arch-universal2-cxx17", "os": "macos-12", "python": "3.8", "script": "build.sh" },
{ "example": "foo", "toolchain": "ios-nocodesign-15-5-arm64-cxx17", "os": "macos-12", "python": "3.8", "script": "build.sh" },
{ "example": "foo", "toolchain": "ninja-vs-16-2019-win64-cxx17", "os": "windows-2019", "python": "3.8", "script": "build.cmd" },
Expand Down
49 changes: 28 additions & 21 deletions cmake/configs/default.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ if(MINGW)
# https://github.com/boostorg/build/issues/301
hunter_default_version(Boost VERSION 1.64.0)
else()
hunter_default_version(Boost VERSION 1.81.0)
hunter_default_version(Boost VERSION 1.83.0)
endif()

hunter_default_version(BoostCompute VERSION 0.5-p0)
Expand All @@ -46,7 +46,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 7.74.0-p2)
hunter_default_version(CURL VERSION 8.4.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 +70,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.12.1)
hunter_default_version(GTest VERSION 1.14.0)
endif()

hunter_default_version(HalideIR VERSION 0.0-32057b5-p0)
Expand Down Expand Up @@ -109,12 +109,12 @@ hunter_default_version(OpenBLAS VERSION 0.3.21)
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.5.5-p0)
hunter_default_version(OpenCV-Extra VERSION 4.5.3)
hunter_default_version(OpenCV VERSION 4.8.1-p0)
hunter_default_version(OpenCV-Extra VERSION 4.8.1)
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)
hunter_default_version(OpenSSL VERSION 3.0.8)
hunter_default_version(OpenSSL VERSION 3.0.12)
hunter_default_version(OpenSceneGraph VERSION 3.6.3-p0)
hunter_default_version(Opus VERSION 1.3.1)
hunter_default_version(Outcome VERSION 2.0)
Expand Down Expand Up @@ -156,7 +156,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-1)
hunter_default_version(SuiteSparse VERSION 5.4.0-2)
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 @@ -170,12 +170,12 @@ hunter_default_version(WebKit VERSION 0.0.2-p0)
hunter_default_version(WebP VERSION 1.2.4-p0)
hunter_default_version(WinSparkle VERSION 0.4.0)
hunter_default_version(YAJL VERSION 2.1.0-p0)
hunter_default_version(ZLIB VERSION 1.2.13-p0)
hunter_default_version(ZLIB VERSION 1.3.0-p0)
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 20220623.1)
hunter_default_version(abseil VERSION 20230802.1)
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 @@ -206,7 +206,7 @@ hunter_default_version(aws-c-common VERSION 0.5.6)
hunter_default_version(aws-sdk-cpp VERSION 1.9.278-p1)
hunter_default_version(aws_lambda_cpp VERSION v0.2.7-p0)
hunter_default_version(basis_universal VERSION 1.16.3-p0)
hunter_default_version(benchmark VERSION 1.6.1)
hunter_default_version(benchmark VERSION 1.8.3)
hunter_default_version(bento4 VERSION 1.6.0-638-p0)
hunter_default_version(binaryen VERSION 1.38.28-p1)
hunter_default_version(bison VERSION 3.0.4-p0)
Expand All @@ -223,7 +223,14 @@ hunter_default_version(catkin VERSION 0.7.17-p0)
hunter_default_version(cctz VERSION 2.2.0)
hunter_default_version(ccv VERSION 0.7-p6)
hunter_default_version(cereal VERSION 1.2.2-p0)
hunter_default_version(ceres-solver VERSION 2.1.0-p1)
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS "8.0")
# Ubuntu 18.04 GCC compiler isn't C++17 conformant enough, stay at lower version
# - Ubuntu 18.04 disablement: https://github.com/ceres-solver/ceres-solver/commit/40c1a7e18ee040261f87b32374c9a46724ca2214
# - 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)
endif()
hunter_default_version(cgltf VERSION 1.10-f9a8804-p0)
hunter_default_version(check_ci_tag VERSION 1.0.0)
hunter_default_version(chromium_zlib VERSION 0.0.0-f87c2b10efb4-p0)
Expand Down Expand Up @@ -287,7 +294,7 @@ hunter_default_version(filament VERSION 1.9.8)
hunter_default_version(fixesproto VERSION 5.0)
hunter_default_version(flatbuffers VERSION 2.0.0)
hunter_default_version(flex VERSION 2.6.4)
hunter_default_version(fmt VERSION 9.1.0)
hunter_default_version(fmt VERSION 10.1.1)
hunter_default_version(folly VERSION 2018.10.22.00-p4)
hunter_default_version(freetype VERSION 2.10.4-p0)
hunter_default_version(freetype-gl VERSION 0.0.0-1a8c007-p0)
Expand All @@ -307,7 +314,7 @@ hunter_default_version(glfw VERSION 3.3.4-p0)
hunter_default_version(glib VERSION 2.54.0)
hunter_default_version(glm VERSION 0.9.9.8)
hunter_default_version(globjects VERSION 1.1.0-p0)
hunter_default_version(glog VERSION 0.5.0)
hunter_default_version(glog VERSION 0.6.0)
hunter_default_version(glproto VERSION 1.4.17)
hunter_default_version(glslang VERSION 8.13.3743-9eef54b2-p0)
hunter_default_version(glu VERSION 9.0.1-p1)
Expand Down Expand Up @@ -338,7 +345,7 @@ 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 20151201)
hunter_default_version(ippicv VERSION 20230330)
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 @@ -396,7 +403,7 @@ hunter_default_version(magnum VERSION 2019.01)
hunter_default_version(md5 VERSION 1.6)
hunter_default_version(meshoptimizer VERSION 0.16-86740c2-p0)
hunter_default_version(mini_chromium VERSION 0.0.1-p2)
hunter_default_version(miniz VERSION 2.1.0-5ebed82-p0)
hunter_default_version(miniz VERSION 3.0.2)
hunter_default_version(minizip VERSION 1.0.1-p3)
hunter_default_version(mkl VERSION 20190502)
hunter_default_version(mkldnn VERSION 0.19-p0)
Expand Down Expand Up @@ -468,7 +475,7 @@ hunter_default_version(protobuf-c VERSION 1.3.0-p1)
hunter_default_version(pthread-stubs VERSION 0.4)
hunter_default_version(pthreads-win32 VERSION 2.9.1-7ad2af7-p0)
hunter_default_version(pugixml VERSION 1.10-p0)
hunter_default_version(pybind11 VERSION 2.10.4)
hunter_default_version(pybind11 VERSION 2.11.1)
hunter_default_version(qhull VERSION 7.2.0-p1)
hunter_default_version(quickjs VERSION 2020-04-12-p0)
hunter_default_version(rabbitmq-c VERSION 0.10.0)
Expand All @@ -486,7 +493,7 @@ else()
hunter_default_version(range-v3 VERSION 0.12.0)
endif()

hunter_default_version(re2 VERSION 2022.04.01)
hunter_default_version(re2 VERSION 2023.03.01)
hunter_default_version(readline VERSION 6.3)
hunter_default_version(recastnavigation VERSION 1.4-p0)
hunter_default_version(renderproto VERSION 0.11.1)
Expand Down Expand Up @@ -527,11 +534,11 @@ if(MSVC_VERSION LESS 1800)
# for VS12 - version without support C++11
hunter_default_version(spdlog VERSION 1.0.0-p0)
else()
hunter_default_version(spdlog VERSION 1.9.2-p0)
hunter_default_version(spdlog VERSION 1.12.0-p0)
endif()

hunter_default_version(spirv-cross VERSION 20210115)
hunter_default_version(sqlite3 VERSION 3.30.1-p0)
hunter_default_version(sqlite3 VERSION 3.43.2-p0)
hunter_default_version(sse2neon VERSION 1.0.0-p0)
hunter_default_version(stanhull VERSION 0.0.1)
hunter_default_version(state_machine VERSION 1.1)
Expand Down Expand Up @@ -602,13 +609,13 @@ hunter_default_version(xrandr VERSION 1.3.2)
hunter_default_version(xrender VERSION 0.9.7)
hunter_default_version(xshmfence VERSION 1.3)
hunter_default_version(xtrans VERSION 1.4.0)
hunter_default_version(xxHash VERSION 0.8.2)
hunter_default_version(xxf86vm VERSION 1.1.2)
hunter_default_version(xxhash VERSION 0.6.5-p0)
hunter_default_version(yaml-cpp VERSION 0.6.3)
hunter_default_version(zip VERSION 0.1.15)
hunter_default_version(zlog VERSION 1.2.14)
hunter_default_version(zookeeper VERSION 3.4.9-p2)
hunter_default_version(zstd VERSION 1.5.0)
hunter_default_version(zstd VERSION 1.5.5)

if(ANDROID)
string(COMPARE EQUAL "${CMAKE_SYSTEM_VERSION}" "" _is_empty)
Expand Down
9 changes: 6 additions & 3 deletions cmake/find/FindOpenSSL.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -338,13 +338,16 @@ if(OPENSSL_INCLUDE_DIR AND EXISTS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h")
else()
# Version parsing post 3.x
file(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" OPENSSL_VERSION_MAJOR
REGEX "^#[\t ]*define[\t ]+OPENSSL_VERSION_MAJOR[\t ]+([0-9a-fA-F])+.*")
REGEX "^#[\t ]*define[\t ]+OPENSSL_VERSION_MAJOR[\t ]+[0-9a-fA-F]+.*")
string(REGEX REPLACE "^.*OPENSSL_VERSION_MAJOR[\t ]+([0-9a-fA-F]+).*$" "\\1" OPENSSL_VERSION_MAJOR "${OPENSSL_VERSION_MAJOR}")
string(COMPARE EQUAL "${OPENSSL_VERSION_MAJOR}" "" _major_is_empty)
file(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" OPENSSL_VERSION_MINOR
REGEX "^#[\t ]*define[\t ]+OPENSSL_VERSION_MINOR[\t ]+([0-9a-fA-F])+.*")
REGEX "^#[\t ]*define[\t ]+OPENSSL_VERSION_MINOR[\t ]+[0-9a-fA-F]+.*")
string(REGEX REPLACE "^.*OPENSSL_VERSION_MINOR[\t ]+([0-9a-fA-F]+).*$" "\\1" OPENSSL_VERSION_MINOR "${OPENSSL_VERSION_MINOR}")
string(COMPARE EQUAL "${OPENSSL_VERSION_MINOR}" "" _minor_is_empty)
file(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" OPENSSL_VERSION_PATCH
REGEX "^#[\t ]*define[\t ]+OPENSSL_VERSION_PATCH[\t ]+([0-9a-fA-F])+.*")
REGEX "^#[\t ]*define[\t ]+OPENSSL_VERSION_PATCH[\t ]+[0-9a-fA-F]+.*")
string(REGEX REPLACE "^.*OPENSSL_VERSION_PATCH[\t ]+([0-9a-fA-F]+).*$" "\\1" OPENSSL_VERSION_PATCH "${OPENSSL_VERSION_PATCH}")
string(COMPARE EQUAL "${OPENSSL_VERSION_PATCH}" "" _patch_is_empty)

if(_major_is_empty OR _minor_is_empty OR _patch_is_empty)
Expand Down
2 changes: 1 addition & 1 deletion cmake/modules/hunter_apply_gate_settings.cmake
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (c) 2015, Ruslan Baratov
# All rights reserved.

cmake_minimum_required(VERSION 3.0)
cmake_minimum_required(VERSION 3.5)

include(CMakeParseArguments) # cmake_parse_arguments

Expand Down
2 changes: 1 addition & 1 deletion cmake/modules/hunter_boost_component_b2_args.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Copyright (c) 2016, Ruslan Baratov
# All rights reserved.

cmake_minimum_required(VERSION 3.0)
cmake_minimum_required(VERSION 3.5)

# for iostreams dependency on ZLIB and BZIP2
include(hunter_add_package)
Expand Down
2 changes: 1 addition & 1 deletion cmake/modules/hunter_calculate_config_sha1.cmake
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (c) 2015, Ruslan Baratov
# All rights reserved.

cmake_minimum_required(VERSION 3.0)
cmake_minimum_required(VERSION 3.5)

include(hunter_assert_not_empty_string)
include(hunter_config)
Expand Down
2 changes: 1 addition & 1 deletion cmake/modules/hunter_calculate_self.cmake
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (c) 2015, Ruslan Baratov
# All rights reserved.

cmake_minimum_required(VERSION 3.0)
cmake_minimum_required(VERSION 3.5)

include(hunter_internal_error)
include(hunter_assert_not_empty_string)
Expand Down
16 changes: 16 additions & 0 deletions cmake/modules/hunter_create_cache_file.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,22 @@ function(hunter_create_cache_file cache_path)
"set(CMAKE_POLICY_DEFAULT_CMP0069 NEW CACHE INTERNAL \"\")\n"
)

# CMP0114 should be set to NEW to squash CMake warnings at Xcode build time,
# without modifying source code
file(
APPEND
"${temp_path}"
"set(CMAKE_POLICY_DEFAULT_CMP0114 NEW CACHE INTERNAL \"\")\n"
)

# CMP0135 should be set to NEW to squash CMake warnings at build time,
# without modifying source code
file(
APPEND
"${temp_path}"
"set(CMAKE_POLICY_DEFAULT_CMP0135 NEW CACHE INTERNAL \"\")\n"
)

# Disable package registry {
### http://www.cmake.org/cmake/help/v3.1/manual/cmake-packages.7.html#disabling-the-package-registry
file(
Expand Down
2 changes: 1 addition & 1 deletion cmake/modules/hunter_lock_directory.cmake
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (c) 2015, Ruslan Baratov
# All rights reserved.

cmake_minimum_required(VERSION 3.0)
cmake_minimum_required(VERSION 3.5)

include(hunter_fatal_error)
include(hunter_status_debug)
Expand Down
2 changes: 1 addition & 1 deletion cmake/modules/hunter_make_directory.cmake
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (c) 2015, Ruslan Baratov
# All rights reserved.

cmake_minimum_required(VERSION 3.0)
cmake_minimum_required(VERSION 3.5)

include(hunter_internal_error)
include(hunter_lock_directory)
Expand Down
2 changes: 1 addition & 1 deletion cmake/modules/hunter_set_config_location.cmake
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (c) 2015, Ruslan Baratov
# All rights reserved.

cmake_minimum_required(VERSION 3.0)
cmake_minimum_required(VERSION 3.5)

include(hunter_internal_error)
include(hunter_status_print)
Expand Down
2 changes: 1 addition & 1 deletion cmake/modules/hunter_setup_msvc.cmake
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (c) 2014-2016, Ruslan Baratov, Sumedh Ghaisas
# All rights reserved.

cmake_minimum_required(VERSION 3.0)
cmake_minimum_required(VERSION 3.5)

include(hunter_fatal_error)
include(hunter_internal_error)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (c) 2013, 2015 Ruslan Baratov, Alexandre Pretyman
# All rights reserved.

cmake_minimum_required(VERSION 3.0)
cmake_minimum_required(VERSION 3.5)
project(Hunter)

list(APPEND CMAKE_MODULE_PATH "@HUNTER_SELF@/cmake/modules")
Expand Down
Loading

0 comments on commit 8cb4411

Please sign in to comment.