Skip to content

Commit 7766670

Browse files
committed
Use VCPKG triplets from build-scripts/
- Point to triplets from base configuration - Move Ninja to basic preset requirement - Remove x64-debug because not used
1 parent 97b6f98 commit 7766670

File tree

2 files changed

+9
-20
lines changed

2 files changed

+9
-20
lines changed

CMakePresets.json

+4-20
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66
"description": "Base Build Configuration",
77
"binaryDir": "${sourceDir}/out/build/${presetName}",
88
"installDir": "${sourceDir}/out/install/${presetName}",
9+
"generator": "Ninja",
10+
"cacheVariables": {
11+
"VCPKG_OVERLAY_TRIPLETS": "${sourceDir}/build-scripts"
12+
},
913
"hidden": true
1014
},
1115
{
@@ -23,7 +27,6 @@
2327
"inherits": [ "windows" ],
2428
"description": "Visual C++ Configuration",
2529
"toolchainFile": "${sourceDir}/build-scripts/MSVC.cmake",
26-
"generator": "Ninja",
2730
"hidden": true
2831
},
2932
{
@@ -48,25 +51,6 @@
4851
"LOCALIZE": "True",
4952
"TILES": "True"
5053
}
51-
},
52-
{
53-
"name": "x64-debug",
54-
"inherits": [ "x64-windows-static" ],
55-
"displayName": "x64 Debug",
56-
"description": "Target Windows (64-bit) with the Visual Studio development environment. (Debug)",
57-
"cacheVariables": {
58-
"CMAKE_PROJECT_INCLUDE_BEFORE": "${sourceDir}/build-scripts/FindVCPKG.cmake",
59-
"CMAKE_BUILD_TYPE": "Debug",
60-
"CURSES": "False",
61-
"LOCALIZE": "False",
62-
"TILES": "True"
63-
}
64-
}
65-
],
66-
"buildPresets": [
67-
{
68-
"name": "x64-debug",
69-
"configurePreset": "x64-debug"
7054
}
7155
]
7256
}
+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
set(VCPKG_TARGET_ARCHITECTURE x64)
2+
set(VCPKG_CRT_LINKAGE static)
3+
set(VCPKG_LIBRARY_LINKAGE static)
4+
5+
set(VCPKG_BUILD_TYPE release)

0 commit comments

Comments
 (0)