Skip to content

Commit e36787c

Browse files
committed
Update vcpkg and CMakePresets
1 parent 912894f commit e36787c

File tree

4 files changed

+46
-95
lines changed

4 files changed

+46
-95
lines changed

CMakePresets.json

Lines changed: 42 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"cmakeMinimumRequired": { "major": 3, "minor": 21, "patch": 0 },
44
"configurePresets": [
55
{
6-
"name": "base",
6+
"name": "flags",
77
"hidden": true,
88
"cacheVariables": {
99
"CMAKE_CXX_FLAGS": "/permissive- /Zc:preprocessor /EHsc /MP /W4 -DWIN32_LEAN_AND_MEAN -DNOMINMAX -DUNICODE -D_UNICODE"
@@ -19,23 +19,15 @@
1919
"CMAKE_MSVC_RUNTIME_LIBRARY": "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL"
2020
}
2121
},
22-
{ "name": "win32", "hidden": true },
23-
{
24-
"name": "win32-unicode",
25-
"hidden": true,
26-
"inherits": "win32"
27-
},
2822
{
2923
"name": "x64",
3024
"hidden": true,
31-
"architecture": {
32-
"value": "x64",
33-
"strategy": "external"
34-
}
25+
"architecture": { "value": "x64", "strategy": "external" }
3526
},
3627
{
3728
"name": "msvc",
3829
"hidden": true,
30+
"generator": "Visual Studio 17 2022",
3931
"vendor": {
4032
"microsoft.com/VisualStudioSettings/CMake/1.0": {
4133
"intelliSenseMode": "windows-msvc-x64",
@@ -45,58 +37,51 @@
4537
}
4638
},
4739
{
48-
"name": "build-debug-msvc",
49-
"inherits": [
50-
"base",
51-
"vcpkg",
52-
"win32-unicode",
53-
"x64",
54-
"msvc"
55-
],
56-
"displayName": "Debug",
57-
"description": "Debug build for testing.",
58-
"generator": "Visual Studio 17 2022",
59-
"binaryDir": "${sourceDir}/build/debug-msvc",
40+
"name": "mod-deploy",
41+
"hidden": true,
6042
"cacheVariables": {
61-
"CMAKE_BUILD_TYPE": {
62-
"type": "STRING",
63-
"value": "Debug"
64-
}
43+
"DEPLOY_MOD": { "type": "BOOL", "value": "ON" },
44+
"DEPLOY_ROOT": { "type": "STRING", "value": "$env{SKYRIM_MODS_DEPLOY_ROOT}" }
6545
}
6646
},
6747
{
68-
"name": "build-release-msvc",
69-
"inherits": [
70-
"base",
71-
"vcpkg",
72-
"win32-unicode",
73-
"x64",
74-
"msvc"
75-
],
76-
"displayName": "Release",
77-
"description": "Optimized release build.",
78-
"generator": "Visual Studio 17 2022",
79-
"binaryDir": "${sourceDir}/build/release-msvc",
80-
"cacheVariables": {
81-
"CMAKE_BUILD_TYPE": {
82-
"type": "STRING",
83-
"value": "Release"
84-
}
85-
}
86-
}
87-
],
88-
"buildPresets": [
48+
"name": "base-configuration",
49+
"hidden": true,
50+
"inherits": [ "flags", "vcpkg", "x64", "msvc" ]
51+
},
8952
{
90-
"name": "release-msvc",
91-
"displayName": "Release (MSVC)",
92-
"configurePreset": "build-release-msvc",
93-
"description": "Optimized release build."
53+
"name": "debug-configuration",
54+
"inherits": [ "base-configuration" ],
55+
"displayName": "Debug",
56+
"description": "Debug build",
57+
"binaryDir": "${sourceDir}/build/Debug",
58+
"cacheVariables": { "CMAKE_BUILD_TYPE": { "type": "STRING", "value": "Debug" }}
9459
},
9560
{
96-
"name": "debug-msvc",
97-
"displayName": "Debug (MSVC)",
98-
"configurePreset": "build-debug-msvc",
99-
"description": "Debug build for testing."
61+
"name": "debug-configuration-deploy",
62+
"inherits": ["debug-configuration", "mod-deploy"],
63+
"displayName": "Debug + Deploy",
64+
"description": "Debug and copy .dll and mod resources to SKYRIM_MODS"
65+
},
66+
{
67+
"name": "release-configuration",
68+
"inherits": [ "base-configuration" ],
69+
"displayName": "Release",
70+
"description": "Release build",
71+
"binaryDir": "${sourceDir}/build/Release",
72+
"cacheVariables": { "CMAKE_BUILD_TYPE": { "type": "STRING", "value": "Release" }}
73+
},
74+
{
75+
"name": "release-configuration-deploy",
76+
"inherits": ["release-configuration", "mod-deploy"],
77+
"displayName": "Release + Deploy",
78+
"description": "Release and copy .dll and mod resources to SKYRIM_MODS"
10079
}
80+
],
81+
"buildPresets": [
82+
{ "name": "build-debug", "displayName": "Debug", "configurePreset": "debug-configuration" },
83+
{ "name": "build-debug-deploy", "displayName": "Debug Deploy", "configurePreset": "debug-configuration-deploy" },
84+
{ "name": "build-release", "displayName": "Release", "configurePreset": "release-configuration" },
85+
{ "name": "build-release-deploy", "displayName": "Release Deploy", "configurePreset": "release-configuration-deploy" }
10186
]
102-
}
87+
}

Wait.code-workspace

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

vcpkg-configuration.json

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,9 @@
33
{
44
"kind": "git",
55
"repository": "https://gitlab.com/colorglass/vcpkg-colorglass",
6-
"baseline": "1b279b20c7e0db1c9d549ff3b64e024c01317b55",
6+
"baseline": "6fb127f7d425ae3cf3fab0f79005d907c885c0d8",
77
"packages": [
8-
"commonlibsse-ng",
9-
"commonlibsse-ng-ae",
10-
"commonlibsse-ng-se",
11-
"commonlibsse-ng-vr",
12-
"commonlibsse-ng-flatrim"
13-
]
14-
},
15-
{
16-
"kind": "git",
17-
"repository": "https://github.com/mrowrpurr/vcpkg-repo.git",
18-
"baseline": "77afafe5cbc4759d49d5f9524f7b9b016e7380a0",
19-
"packages": [
20-
"bandit"
8+
"commonlibsse-ng"
219
]
2210
}
2311
]

vcpkg.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
{
22
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json",
3-
"name": "sample-plugin",
3+
"name": "skyrimscripting-events",
44
"version-string": "0.0.1",
55
"dependencies": [
6-
"commonlibsse-ng",
7-
"bandit"
6+
"commonlibsse-ng"
87
]
98
}

0 commit comments

Comments
 (0)