From 79174f8223fb35993c65fe5e2dc34408c57a8af8 Mon Sep 17 00:00:00 2001 From: Ethan Chien Date: Fri, 29 Mar 2024 00:50:42 +0800 Subject: [PATCH] fix: Add x64-Debug and win64-Release presets in the CMakePresets sample --- CMakePresets.json.sample | 65 +++++++++++++++++----------------------- 1 file changed, 28 insertions(+), 37 deletions(-) diff --git a/CMakePresets.json.sample b/CMakePresets.json.sample index ac988c9199..6d12c95d8d 100644 --- a/CMakePresets.json.sample +++ b/CMakePresets.json.sample @@ -6,13 +6,6 @@ "patch": 0 }, "configurePresets": [ - { - "name": "dev-mode", - "hidden": true, - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug" - } - }, { "name": "vcpkg", "hidden": true, @@ -25,49 +18,47 @@ "description": "This preset is var settings for KiCad", "hidden": true, "cacheVariables": { - "CMAKE_INSTALL_PREFIX": "out", - "CMAKE_PDB_OUTPUT_DIRECTORY": "out/pdb", "KICAD_BUILD_QA_TESTS": "OFF", "KICAD_BUILD_I18N": "ON", "KICAD_SCRIPTING_WXPYTHON": "ON" } }, { - "name": "ci-std", - "description": "This preset makes sure the project actually builds with at least the specified standard", - "hidden": true, - "cacheVariables": { - "CMAKE_CXX_EXTENSIONS": "OFF", - "CMAKE_CXX_STANDARD": "17", - "CMAKE_CXX_STANDARD_REQUIRED": "ON", - "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" - } - }, - { - "name": "ci-build", - "binaryDir": "${sourceDir}/build", - "hidden": true - }, - { - "name": "ci-win64", - "inherits": [ - "ci-std" - ], + "name": "win64", "generator": "Ninja", + "binaryDir": "${sourceDir}/build", "hidden": true, "cacheVariables": { - "KICAD_WIN32_DPI_AWARE": "ON" - } - }, - { - "name": "ci-windows", + "KICAD_WIN32_DPI_AWARE": "ON", + "CMAKE_INSTALL_PREFIX": "out", + "CMAKE_PDB_OUTPUT_DIRECTORY": "out/pdb" + }, "inherits": [ - "ci-build", - "ci-win64", - "dev-mode", "vcpkg", "KiCad" ] + }, + { + "name": "win64-Release", + "inherits": [ + "win64", + "vcpkg", + "KiCad" + ], + "cacheVariables": { + "CMAKE_BUILD_TYPE": "RelWithDebInfo" + } + }, + { + "name": "win64-Debug", + "inherits": [ + "win64", + "vcpkg", + "KiCad" + ], + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug" + } } ] } \ No newline at end of file