libsodium 1.0.16-p0

qdrvm · Jul 22, 2018 · fcd1634 · fcd1634
1 parent e1981c5
commit fcd1634
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 4 deletions.
diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake
@@ -284,7 +284,7 @@ hunter_default_version(libogg VERSION 1.3.3-p0)
 hunter_default_version(libpcre VERSION 8.41)
 hunter_default_version(librtmp VERSION 2.4.0-p0)
 hunter_default_version(libscrypt VERSION 1.21-p1)
-hunter_default_version(libsodium VERSION 1.0.16)
+hunter_default_version(libsodium VERSION 1.0.16-p0)
 hunter_default_version(libunibreak VERSION 4.0)
 hunter_default_version(libuv VERSION 1.21.0-p0)
 hunter_default_version(libxml2 VERSION 2.9.7)

diff --git a/cmake/projects/libsodium/hunter.cmake b/cmake/projects/libsodium/hunter.cmake
@@ -30,12 +30,31 @@ hunter_add_version(
     18a2c5758aaf60c0abbc0e6a21f63df80faccfc6
 )
 
-hunter_configuration_types(libsodium CONFIGURATION_TYPES Release)
-if(MSVC)
+hunter_add_version(
+    PACKAGE_NAME
+    libsodium
+    VERSION
+    "1.0.16-p0"
+    URL
+    "https://github.com/hunter-packages/libsodium/archive/v1.0.16-p0.tar.gz"
+    SHA1
+    d986ca5b9759d6518df26248f03db44d4dc9f590
+)
+
+string(COMPARE EQUAL "${HUNTER_libsodium_VERSION}" "1.0.10" __is_1_0_10)
+string(COMPARE EQUAL "${HUNTER_libsodium_VERSION}" "1.0.16" __is_1_0_16)
+
+if(__is_1_0_10 OR __is_1_0_16)
+  hunter_configuration_types(libsodium CONFIGURATION_TYPES Release)
+  if(MSVC)
     hunter_pick_scheme(DEFAULT url_sha1_libsodium_msbuild)
-else()
+  else()
     hunter_pick_scheme(DEFAULT url_sha1_libsodium_autogen_autotools)
+  endif()
+else()
+    hunter_pick_scheme(DEFAULT url_sha1_cmake)
 endif()
+
 hunter_cacheable(libsodium)
 hunter_download(
     PACKAGE_NAME libsodium