From 9e713ecfdf17ed5372b8c0fcfd66b7a83b8dfc28 Mon Sep 17 00:00:00 2001 From: kamilsa Date: Thu, 24 Apr 2025 10:01:20 +0300 Subject: [PATCH 1/7] Use fork of ZLIB when compile on MAC --- cmake/Hunter/config.cmake | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/cmake/Hunter/config.cmake b/cmake/Hunter/config.cmake index 60760abab..3873b0448 100644 --- a/cmake/Hunter/config.cmake +++ b/cmake/Hunter/config.cmake @@ -23,12 +23,22 @@ hunter_config( KEEP_PACKAGE_SOURCES ) -hunter_config( - ZLIB - VERSION 1.3.0-p0 - URL https://github.com/cpp-pm/zlib/archive/refs/tags/v1.3.0-p0.tar.gz - SHA1 311ca59e20cbbfe9d9e05196c12c6ae109093987 -) +if(APPLE) + hunter_config( + ZLIB + URL https://github.com/kamilsa/zlib/archive/b5aad46d87ecb8380189631eef7e1414fbede17f.tar.gz + SHA1 9d6a562f80477bc3198cf18109ec90af022f2ef4 + ) +else() + hunter_config( + ZLIB + VERSION 1.3.0-p0 + URL https://github.com/cpp-pm/zlib/archive/refs/tags/v1.3.0-p0.tar.gz + SHA1 311ca59e20cbbfe9d9e05196c12c6ae109093987 + CMAKE_ARGS + CMAKE_C_FLAGS=-DZ_SOLO=ON + ) +endif() hunter_config( qtils From 226591cd28f9441ce9f283d5d04044a98c079e9d Mon Sep 17 00:00:00 2001 From: kamilsa Date: Thu, 24 Apr 2025 10:34:06 +0300 Subject: [PATCH 2/7] Remove unnecessary CMAKE_ARGS for ZLIB configuration --- cmake/Hunter/config.cmake | 2 -- 1 file changed, 2 deletions(-) diff --git a/cmake/Hunter/config.cmake b/cmake/Hunter/config.cmake index 3873b0448..4969501c1 100644 --- a/cmake/Hunter/config.cmake +++ b/cmake/Hunter/config.cmake @@ -35,8 +35,6 @@ else() VERSION 1.3.0-p0 URL https://github.com/cpp-pm/zlib/archive/refs/tags/v1.3.0-p0.tar.gz SHA1 311ca59e20cbbfe9d9e05196c12c6ae109093987 - CMAKE_ARGS - CMAKE_C_FLAGS=-DZ_SOLO=ON ) endif() From 1af96c8e63b63ad607b61d9075aa4e1250811e75 Mon Sep 17 00:00:00 2001 From: kamilsa Date: Thu, 24 Apr 2025 11:00:51 +0300 Subject: [PATCH 3/7] Try build with hunter where default zlib is updated --- cmake/Hunter/config.cmake | 15 --------------- cmake/Hunter/init.cmake | 4 ++-- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/cmake/Hunter/config.cmake b/cmake/Hunter/config.cmake index 4969501c1..cdddcbc91 100644 --- a/cmake/Hunter/config.cmake +++ b/cmake/Hunter/config.cmake @@ -23,21 +23,6 @@ hunter_config( KEEP_PACKAGE_SOURCES ) -if(APPLE) - hunter_config( - ZLIB - URL https://github.com/kamilsa/zlib/archive/b5aad46d87ecb8380189631eef7e1414fbede17f.tar.gz - SHA1 9d6a562f80477bc3198cf18109ec90af022f2ef4 - ) -else() - hunter_config( - ZLIB - VERSION 1.3.0-p0 - URL https://github.com/cpp-pm/zlib/archive/refs/tags/v1.3.0-p0.tar.gz - SHA1 311ca59e20cbbfe9d9e05196c12c6ae109093987 - ) -endif() - hunter_config( qtils VERSION 0.1.0 diff --git a/cmake/Hunter/init.cmake b/cmake/Hunter/init.cmake index 6f8fc7f35..4e9f830ce 100644 --- a/cmake/Hunter/init.cmake +++ b/cmake/Hunter/init.cmake @@ -31,7 +31,7 @@ set( include(${CMAKE_CURRENT_LIST_DIR}/HunterGate.cmake) HunterGate( - URL https://github.com/qdrvm/hunter/archive/refs/tags/v0.25.3-qdrvm28.tar.gz - SHA1 a4f1b0f42464e07790b7f90b783a822d71be6c6d + URL https://github.com/qdrvm/hunter/archive/3f8542a13b91d9da8c39400955ebda924ae8f00d.tar.gz + SHA1 c8648ca9696b2f957db67acb1a2478bc443a557f LOCAL ) From c7b37d6e6d472f653361a99b46f44b193db5b60a Mon Sep 17 00:00:00 2001 From: kamilsa Date: Thu, 24 Apr 2025 11:29:26 +0300 Subject: [PATCH 4/7] Update qtils version to 0.1.1 and update HunterGate URL and SHA1 --- cmake/Hunter/config.cmake | 6 +----- cmake/Hunter/init.cmake | 4 ++-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/cmake/Hunter/config.cmake b/cmake/Hunter/config.cmake index cdddcbc91..6549e8f29 100644 --- a/cmake/Hunter/config.cmake +++ b/cmake/Hunter/config.cmake @@ -18,16 +18,12 @@ hunter_config( soralog VERSION 0.2.5 - URL https://github.com/qdrvm/soralog/archive/refs/tags/v0.2.5.tar.gz - SHA1 1dafdb9e1921b4069f9e1dad0d0acfae24166bd2 KEEP_PACKAGE_SOURCES ) hunter_config( qtils - VERSION 0.1.0 - URL https://github.com/qdrvm/qtils/archive/refs/tags/v0.1.0.tar.gz - SHA1 acc28902af7dc5d74ac33d486ad2261906716f5e + VERSION 0.1.1 CMAKE_ARGS FORMAT_ERROR_WITH_FULLTYPE=ON KEEP_PACKAGE_SOURCES diff --git a/cmake/Hunter/init.cmake b/cmake/Hunter/init.cmake index 4e9f830ce..7cb399fbc 100644 --- a/cmake/Hunter/init.cmake +++ b/cmake/Hunter/init.cmake @@ -31,7 +31,7 @@ set( include(${CMAKE_CURRENT_LIST_DIR}/HunterGate.cmake) HunterGate( - URL https://github.com/qdrvm/hunter/archive/3f8542a13b91d9da8c39400955ebda924ae8f00d.tar.gz - SHA1 c8648ca9696b2f957db67acb1a2478bc443a557f + URL https://github.com/qdrvm/hunter/archive/54ff243d5b977a57a7ba77229c1fcb19c7c0882a.tar.gz + SHA1 27c03da1bf185f0db6fd852063814899e1d2e492 LOCAL ) From 85316418e1ecc2a29d42dd30331491958ea3586e Mon Sep 17 00:00:00 2001 From: kamilsa Date: Thu, 24 Apr 2025 14:44:00 +0300 Subject: [PATCH 5/7] Update HunterGate URL --- cmake/Hunter/init.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/Hunter/init.cmake b/cmake/Hunter/init.cmake index 7cb399fbc..35383816a 100644 --- a/cmake/Hunter/init.cmake +++ b/cmake/Hunter/init.cmake @@ -31,7 +31,7 @@ set( include(${CMAKE_CURRENT_LIST_DIR}/HunterGate.cmake) HunterGate( - URL https://github.com/qdrvm/hunter/archive/54ff243d5b977a57a7ba77229c1fcb19c7c0882a.tar.gz - SHA1 27c03da1bf185f0db6fd852063814899e1d2e492 + URL https://github.com/qdrvm/hunter/archive/0687efc906ced97c5e06210cb662e4c8235e34e7.tar.gz + SHA1 2f4e5f4597a8967a33b6f881e2080efc629bf56d LOCAL ) From 36d8b48fb2e36ac42a2d671b29331b5f54104cd1 Mon Sep 17 00:00:00 2001 From: kamilsa Date: Thu, 24 Apr 2025 15:31:42 +0300 Subject: [PATCH 6/7] Update HunterGate URL --- cmake/Hunter/init.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/Hunter/init.cmake b/cmake/Hunter/init.cmake index 35383816a..fbbc22d89 100644 --- a/cmake/Hunter/init.cmake +++ b/cmake/Hunter/init.cmake @@ -31,7 +31,7 @@ set( include(${CMAKE_CURRENT_LIST_DIR}/HunterGate.cmake) HunterGate( - URL https://github.com/qdrvm/hunter/archive/0687efc906ced97c5e06210cb662e4c8235e34e7.tar.gz - SHA1 2f4e5f4597a8967a33b6f881e2080efc629bf56d + URL https://github.com/qdrvm/hunter/archive/870a8ab2c4007ee2410c699160986166969773e0.tar.gz + SHA1 515e954894a69d8908478fbc6200dc6187abeb98 LOCAL ) From 00cd7809448759d406fcbcf522f2cd69bae01051 Mon Sep 17 00:00:00 2001 From: kamilsa Date: Thu, 24 Apr 2025 15:51:02 +0300 Subject: [PATCH 7/7] Update HunterGate URL --- cmake/Hunter/init.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/Hunter/init.cmake b/cmake/Hunter/init.cmake index fbbc22d89..12d03fdda 100644 --- a/cmake/Hunter/init.cmake +++ b/cmake/Hunter/init.cmake @@ -31,7 +31,7 @@ set( include(${CMAKE_CURRENT_LIST_DIR}/HunterGate.cmake) HunterGate( - URL https://github.com/qdrvm/hunter/archive/870a8ab2c4007ee2410c699160986166969773e0.tar.gz - SHA1 515e954894a69d8908478fbc6200dc6187abeb98 + URL https://github.com/qdrvm/hunter/archive/refs/tags/v0.25.3-qdrvm36.tar.gz + SHA1 15ca50249cd99e107cb06dc5978fe71118d79a43 LOCAL )