openssl and xxhash (#128)

Co-authored-by: Harrm <[email protected]>
qdrvm · Feb 22, 2024 · 475c0b5 · 475c0b5
1 parent b947ccc
commit 475c0b5
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 9 deletions.
diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake
@@ -111,7 +111,7 @@ hunter_default_version(OpenCV VERSION 4.1.1-p0)
 hunter_default_version(OpenCV-Extra VERSION 4.1.1)
 hunter_default_version(OpenEXR VERSION 2.4.0-p1)
 hunter_default_version(OpenNMTTokenizer VERSION 1.11.0-p1)
-hunter_default_version(OpenSSL VERSION 1.1.1t)
+hunter_default_version(OpenSSL VERSION 1.1.1w)
 hunter_default_version(OpenSceneGraph VERSION 3.6.3-p0)
 hunter_default_version(PNG VERSION 1.6.26-p6)
 hunter_default_version(PROJ4 VERSION 5.0.0)
@@ -560,7 +560,7 @@ 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(xxf86vm VERSION 1.1.2)
-hunter_default_version(xxhash VERSION 0.6.5-p0)
+hunter_default_version(xxhash VERSION 0.8.2)
 hunter_default_version(yaml-cpp VERSION 0.6.2-0f9a586-p1)
 hunter_default_version(zip VERSION 0.1.15)
 hunter_default_version(zookeeper VERSION 3.4.9-p2)

diff --git a/cmake/projects/OpenSSL/hunter.cmake b/cmake/projects/OpenSSL/hunter.cmake
@@ -154,6 +154,17 @@ hunter_add_version(
     34ea65451f7fc4625f31ba50f89b3fbea12f13f3
 )
 
+hunter_add_version(
+    PACKAGE_NAME
+    OpenSSL
+    VERSION
+    "1.1.1w"
+    URL
+    "https://github.com/openssl/openssl/archive/OpenSSL_1_1_1w.tar.gz"
+    SHA1
+    3409260b6a9bf19d10d253c670e5e7b3c7b3a90b
+)
+
 hunter_add_version(
     PACKAGE_NAME
     OpenSSL

diff --git a/cmake/projects/xxhash/hunter.cmake b/cmake/projects/xxhash/hunter.cmake
@@ -12,13 +12,13 @@ hunter_add_version(
     PACKAGE_NAME
     xxhash
     VERSION
-    0.6.5-p0
+    0.8.2
     URL
-    "https://github.com/hunter-packages/xxHash/archive/0.6.5-p0.tar.gz"
+    "https://github.com/Cyan4973/xxHash/archive/v0.8.2.tar.gz"
     SHA1
-    7d84575a45360d5c5c075ceb3fc1eb6b334aa5a4
+    8df702581ebc48a5e05be0f1ede6e1e9139e4da1
 )
 
-hunter_pick_scheme(DEFAULT url_sha1_cmake)
+hunter_pick_scheme(DEFAULT url_sha1_make_only)
 hunter_cacheable(xxhash)
 hunter_download(PACKAGE_NAME xxhash)
diff --git a/cmake/schemes/url_sha1_make_only.cmake.in b/cmake/schemes/url_sha1_make_only.cmake.in
@@ -39,13 +39,13 @@ ExternalProject_Add(
 	SOURCE_DIR
 	"@HUNTER_PACKAGE_SOURCE_DIR@" # Unpack directory
 	INSTALL_DIR
-	"@HUNTER_INSTALL_PREFIX@" # not used actually (see install command)
+	"@HUNTER_INSTALLHUNHUNTER_PACKAGE_INSTALL_PREFIXTER_PACKAGE_INSTALL_PREFIX_PREFIX@" # not used actually (see install command)
 	CONFIGURE_COMMAND
 	""
 	BUILD_COMMAND
-	make PREFIX="@HUNTER_INSTALL_PREFIX@"
+	make PREFIX="@HUNTER_PACKAGE_INSTALL_PREFIX@"
 	BUILD_IN_SOURCE
 	1
 	INSTALL_COMMAND
-	make PREFIX="@HUNTER_INSTALL_PREFIX@" install
+	make PREFIX="@HUNTER_PACKAGE_INSTALL_PREFIX@" install
 )