Skip to content

Commit

Permalink
Merge vcpkg-configuration.json into vcpkg.json.
Browse files Browse the repository at this point in the history
  • Loading branch information
Holt59 committed Jul 16, 2024
1 parent b719544 commit d78fd63
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 22 deletions.
21 changes: 0 additions & 21 deletions vcpkg-configuration.json

This file was deleted.

22 changes: 21 additions & 1 deletion vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,31 @@
"boost-thread",
"boost-predef"
],
"builtin-baseline": "f61a294e765b257926ae9e9d85f96468a0af74e7",
"features": {
"testing": {
"description": "Build USVFS tests.",
"dependencies": ["gtest"]
}
},
"vcpkg-configuration": {
"default-registry": {
"kind": "git",
"repository": "https://github.com/Microsoft/vcpkg",
"baseline": "b2fd29fec759bf49fd40bfd633204200b115a2b5"
},
"registries": [
{
"kind": "git",
"repository": "https://github.com/Microsoft/vcpkg",
"baseline": "b2fd29fec759bf49fd40bfd633204200b115a2b5",
"packages": ["boost*", "boost-*"]
},
{
"kind": "git",
"repository": "https://github.com/ModOrganizer2/vcpkg-registry",
"baseline": "1fe57e2a569f00526fa8f7347282a646148f362b",
"packages": ["asmjit", "spdlog"]
}
]
}
}

0 comments on commit d78fd63

Please sign in to comment.