From 6825c43dfa05fb38cdd5825a4afd748650811c29 Mon Sep 17 00:00:00 2001 From: Colm Vize Date: Thu, 30 Jan 2025 19:41:35 +0000 Subject: [PATCH 1/5] trying to add bgfx --- cmake/configs/default.cmake | 1 + cmake/projects/bgfx/hunter.cmake | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 cmake/projects/bgfx/hunter.cmake diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index 926ba8c0d9..173abcec68 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -31,6 +31,7 @@ hunter_default_version(ArrayFire VERSION 3.3.1-p0) hunter_default_version(Assimp VERSION 5.2.5-9519a62) hunter_default_version(Async++ VERSION 0.0.3-hunter) hunter_default_version(Avahi VERSION 0.6.31) +hunter_default_version(bgfx VERSION 1.0.0) hunter_default_version(BZip2 VERSION 1.0.8-p0) hunter_default_version(Beast VERSION 1.0.0-b84-hunter-0) diff --git a/cmake/projects/bgfx/hunter.cmake b/cmake/projects/bgfx/hunter.cmake new file mode 100644 index 0000000000..b05d5378b8 --- /dev/null +++ b/cmake/projects/bgfx/hunter.cmake @@ -0,0 +1,21 @@ +# !!! DO NOT PLACE HEADER GUARDS HERE !!! + +include(hunter_add_version) +include(hunter_cacheable) +include(hunter_cmake_args) +include(hunter_download) +include(hunter_pick_scheme) +include(hunter_report_broken_package) + +hunter_add_version( + PACKAGE_NAME bgfx + VERSION "1.0.0" + URL "https://github.com/mloccy/bgfx.cmake/archive/refs/tags/1.0.0.tar.gz" + SHA1 b8a5c0d7a1c8933fb50e561dad6fbb9462b9b1b3 +) + +hunter_cmake_args(bgfx CMAKE_ARGS BGFX_BUILD_EXAMPLES=OFF BGFX_BUILD_TESTS=OFF) + +hunter_pick_scheme(DEFAULT url_sha1_cmake) +hunter_cacheable(bgfx) +hunter_download(PACKAGE_NAME bgfx) From e29580f65ba260d1b6be88177835d365beec75e3 Mon Sep 17 00:00:00 2001 From: Colm Vize Date: Thu, 30 Jan 2025 19:49:40 +0000 Subject: [PATCH 2/5] fixing order --- cmake/configs/default.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index 173abcec68..8e82bd8106 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -31,8 +31,8 @@ hunter_default_version(ArrayFire VERSION 3.3.1-p0) hunter_default_version(Assimp VERSION 5.2.5-9519a62) hunter_default_version(Async++ VERSION 0.0.3-hunter) hunter_default_version(Avahi VERSION 0.6.31) -hunter_default_version(bgfx VERSION 1.0.0) hunter_default_version(BZip2 VERSION 1.0.8-p0) +hunter_default_version(bgfx VERSION 1.0.0) hunter_default_version(Beast VERSION 1.0.0-b84-hunter-0) if(MINGW) From a56fd531b3b82773bf047a67403088d0ecae5c73 Mon Sep 17 00:00:00 2001 From: Colm Vize Date: Thu, 30 Jan 2025 19:52:21 +0000 Subject: [PATCH 3/5] ... --- cmake/configs/default.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index 8e82bd8106..2a0fb19f90 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -32,14 +32,13 @@ hunter_default_version(Assimp VERSION 5.2.5-9519a62) hunter_default_version(Async++ VERSION 0.0.3-hunter) hunter_default_version(Avahi VERSION 0.6.31) hunter_default_version(BZip2 VERSION 1.0.8-p0) -hunter_default_version(bgfx VERSION 1.0.0) hunter_default_version(Beast VERSION 1.0.0-b84-hunter-0) if(MINGW) - # https://github.com/boostorg/build/issues/301 - hunter_default_version(Boost VERSION 1.64.0) +# https://github.com/boostorg/build/issues/301 +hunter_default_version(Boost VERSION 1.64.0) else() - hunter_default_version(Boost VERSION 1.83.0) +hunter_default_version(Boost VERSION 1.83.0) endif() hunter_default_version(BoostCompute VERSION 0.5-p0) @@ -214,6 +213,7 @@ 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.8.3) hunter_default_version(bento4 VERSION 1.6.0-638-p0) +hunter_default_version(bgfx VERSION 1.0.0) hunter_default_version(binaryen VERSION 1.38.28-p1) hunter_default_version(bison VERSION 3.0.4-p0) hunter_default_version(boost-pba VERSION 1.0.0-p0) From 013fb1708352fa71a49d1e385024794177806560 Mon Sep 17 00:00:00 2001 From: Colm Vize Date: Thu, 30 Jan 2025 20:11:59 +0000 Subject: [PATCH 4/5] new version --- cmake/projects/bgfx/hunter.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/projects/bgfx/hunter.cmake b/cmake/projects/bgfx/hunter.cmake index b05d5378b8..dc5bbc2c41 100644 --- a/cmake/projects/bgfx/hunter.cmake +++ b/cmake/projects/bgfx/hunter.cmake @@ -10,8 +10,8 @@ include(hunter_report_broken_package) hunter_add_version( PACKAGE_NAME bgfx VERSION "1.0.0" - URL "https://github.com/mloccy/bgfx.cmake/archive/refs/tags/1.0.0.tar.gz" - SHA1 b8a5c0d7a1c8933fb50e561dad6fbb9462b9b1b3 + URL "https://github.com/mloccy/bgfx.cmake/releases/download/1.0.0/bgfx.tar.gz" + SHA1 01c5e53c6b43706ec21353bdf4d52e8b47cae856 ) hunter_cmake_args(bgfx CMAKE_ARGS BGFX_BUILD_EXAMPLES=OFF BGFX_BUILD_TESTS=OFF) From bf05aa1af3455004e945392004845b23f5e24eab Mon Sep 17 00:00:00 2001 From: Colm Vize Date: Fri, 31 May 2024 14:37:01 +0100 Subject: [PATCH 5/5] fixing MSVC version 1940 --- cmake/modules/hunter_setup_msvc.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cmake/modules/hunter_setup_msvc.cmake b/cmake/modules/hunter_setup_msvc.cmake index 8cd2a5162c..676442ef2a 100644 --- a/cmake/modules/hunter_setup_msvc.cmake +++ b/cmake/modules/hunter_setup_msvc.cmake @@ -67,6 +67,8 @@ macro(hunter_setup_msvc) 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 "^19[34][0-9]$" _vs_17_2022 "${MSVC_VERSION}") + string(REGEX MATCH "^193[0-9]$" _vs_17_2022 "${MSVC_VERSION}") + string(REGEX MATCH "^1940$" _vs_17_2022 "${MSVC_VERSION}") if(_vs_8_2005) set(HUNTER_MSVC_VERSION "8")