Skip to content

Commit b54bbc3

Browse files
author
mikeblome
committed
proofread pass
1 parent 2bd66c0 commit b54bbc3

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

docs/build/cmakesettings-reference.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ A `configuration` has these properties:
3030
- `buildRoot`: specifies the directory in which CMake generates build scripts for the chosen generator. Maps to **-DCMAKE_BINARY_DIR** switch and specifies where the CMake cache will be created. If the folder does not exist, it is created. Supported macros include `${workspaceRoot}`, `${workspaceHash}`, `${projectFile}`, `${projectDir}`, `${thisFile}`, `${thisFileDir}`, `${name}`, `${generator}`, and `${env.VARIABLE}`.
3131
- `cacheGenerationCommand`: specifies a command line tool and arguments, for example *gencache.bat debug* to generate the cache. The command is run from the shell in the specified environment for the configuration when the user explicity requests regeneration, or a CMakeLists.txt or CMakeSettings.json file is modified.
3232
- `cacheRoot`: specifies the path to a CMake cache. This directory should contain an existing CMakeCache.txt file.
33-
- `clangTidyChecks`: comma-separated list of warnigns which will be passed to clang-tidy; wildcards are allowed and '-' prefix will remove checks.
33+
- `clangTidyChecks`: comma-separated list of warnings which will be passed to clang-tidy; wildcards are allowed and '-' prefix will remove checks.
3434
- `cmakeCommandArgs`: specifies additional command-line options passed to CMake when invoked to generate the cache.
3535
- `cmakeToolchain`: specifies the toolchain file. This is passed to CMake using -DCMAKE_TOOLCHAIN_FILE."
3636
- `codeAnalysisRuleset`: specifies the ruleset to use when running code analysis. This can be a full path or the file name of a ruleset file installed by Visual Studio.
Loading

docs/build/open-folder-projects-cpp.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: "Open Folder support for C++ build systems in Visual Studio"
3-
ms.date: "10/21/2019"
3+
ms.date: "12/02/2019"
44
helpviewer_keywords: ["Open Folder Projects in Visual Studio"]
55
ms.assetid: abd1985e-3717-4338-9e80-869db5435175
66
---
@@ -71,9 +71,9 @@ This configuration inherits the environment variables of the Visual Studio [x64
7171
> [!NOTE]
7272
> If Visual Studio seems to be ignoring settings in *CppProperties.json*, try adding an exception to your *.gitignore* file like this: `!/CppProperties.json`.
7373
74-
## Default configuration for MIngw-W64
74+
## Default configuration for MinGW-w64
7575

76-
If you add the Mingw-W64 configuration, the JSON looks this this:
76+
If you add the MinGW-W64 configuration, the JSON looks this this:
7777

7878
```json
7979
{
@@ -172,7 +172,7 @@ For more information, see [Tasks.vs.json schema reference](tasks-vs-json-schema-
172172

173173
### Configure debugging parameters with launch.vs.json
174174

175-
To customize your program’s command line arguments and debugging instructions, right-click on the executable in **Solution Explorer** and select **Debug and Launch Settings**. This will open an existing *launch.vs.json* file, or if none exists, it will create a new file with a set of minimal launch settings. First you are given a choice of what kind of debug session you want to configure. For debugging a MinGw-w64 project, we choose **C/C++ Launch for MinGGW/Cygwin (gdb)**. This creates a launch configuration for using *gdb.exe* with some educated guesses about default values. One of those default values is `MINGW_PREFIX`. You can substitute the literal path (as shown below) or you can define a `MINGW_PREFIX` property in *CppProperties.json*:
175+
To customize your program’s command line arguments and debugging instructions, right-click on the executable in **Solution Explorer** and select **Debug and Launch Settings**. This will open an existing *launch.vs.json* file, or if none exists, it will create a new file with a set of minimal launch settings. First you are given a choice of what kind of debug session you want to configure. For debugging a MinGw-w64 project, we choose **C/C++ Launch for MinGW/Cygwin (gdb)**. This creates a launch configuration for using *gdb.exe* with some educated guesses about default values. One of those default values is `MINGW_PREFIX`. You can substitute the literal path (as shown below) or you can define a `MINGW_PREFIX` property in *CppProperties.json*:
176176

177177
```json
178178
{

0 commit comments

Comments
 (0)