aboutsummaryrefslogtreecommitdiff
path: root/versions
diff options
context:
space:
mode:
authorThomas Gwynne-Timothy <thomas.gt@live.com>2021-03-29 10:45:43 -0600
committerGitHub <noreply@github.com>2021-03-29 09:45:43 -0700
commit2980294114179299de1794e230187e98785d858d (patch)
treee6dbc9695a922049067bb269182f2453674dc6e5 /versions
parent38c073dc7a1604362e4bec14252f6a0a7de50e86 (diff)
downloadvcpkg-2980294114179299de1794e230187e98785d858d.tar.gz
vcpkg-2980294114179299de1794e230187e98785d858d.zip
[libsodium] Rework CMake build to match autoconf (#16730)
* !wip Use targets to organize build * !wip Add separate file list for MSVC builds * Restructure to match autoconf I re-ordered everything so it is easier to compare directly with the project's autoconf build files. * Move config files to expected location * Convert CONTROL file to manifest file Use vcpkg helper ports. * Use sqlite3's approach to creating config file * Fix MSVC source list I was originally using libsodium:master as a reference, not the release. * Turn off tests * Fix definition scope * Fix JSON formatting Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * Update libsodium version metadata * [libsodium] Fix x64-windows-static[-md] builds * [libsodium] Update port version metadata Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * Glob headers and sources on Windows * [libsodium] Fix GLOB on Windows * [libsodium] Update verson hash Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Diffstat (limited to 'versions')
-rw-r--r--versions/baseline.json2
-rw-r--r--versions/l-/libsodium.json5
2 files changed, 6 insertions, 1 deletions
diff --git a/versions/baseline.json b/versions/baseline.json
index a4cb5e6fa..a7ac25ae1 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3434,7 +3434,7 @@
},
"libsodium": {
"baseline": "1.0.18",
- "port-version": 3
+ "port-version": 4
},
"libsoundio": {
"baseline": "2.0.0-3",
diff --git a/versions/l-/libsodium.json b/versions/l-/libsodium.json
index 5180f8086..a32fb9901 100644
--- a/versions/l-/libsodium.json
+++ b/versions/l-/libsodium.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "6ec1ee39e69052d50e773857064d2d06968ee8c3",
+ "version-string": "1.0.18",
+ "port-version": 4
+ },
+ {
"git-tree": "fc00e8b0dba7ee227aa5d53860c1b5cfe92b8819",
"version-string": "1.0.18",
"port-version": 3