Skip to content

Commit 431dd02

Browse files
remove catch2 overlay port
1 parent e5d8e38 commit 431dd02

4 files changed

Lines changed: 2 additions & 58 deletions

File tree

CMakePresets.json

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,7 @@
3030
{
3131
"name": "vcpkg",
3232
"hidden": true,
33-
"toolchainFile": "$env{VCPKG_INSTALLATION_ROOT}/scripts/buildsystems/vcpkg.cmake",
34-
"cacheVariables": {
35-
"VCPKG_OVERLAY_PORTS": {
36-
"type": "STRING",
37-
"value": "${sourceDir}/cmake/ports"
38-
}
39-
}
33+
"toolchainFile": "$env{VCPKG_INSTALLATION_ROOT}/scripts/buildsystems/vcpkg.cmake"
4034
},
4135
{
4236
"name": "windows",

cmake/ports/catch2/portfile.cmake

Lines changed: 0 additions & 36 deletions
This file was deleted.

cmake/ports/catch2/vcpkg.json

Lines changed: 0 additions & 14 deletions
This file was deleted.

tests/examples/pack_unpack.test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ TEST_CASE("pack_unpack", "[examples]")
241241

242242
const auto texture = (root / "fo4_texture.ba2"sv).string();
243243
bsa::fo4::archive ba2;
244-
ba2.write({ texture }, { .format = bsa::fo4::format::directx });
244+
ba2.write({ texture }, { .format_ = bsa::fo4::format::directx });
245245

246246
REQUIRE_THROWS_WITH(
247247
invokeMain("pack"),

0 commit comments

Comments
 (0)