Skip to content

Commit b7192a7

Browse files
authored
Capitalization of 'M' in CMake
1 parent d51ed21 commit b7192a7

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

docs/ide/cmake-tools-for-visual-cpp.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ usage: ninja [options] [targets...]
244244

245245
### Inherited environments (Visual Studio 2017 version 15.5)
246246

247-
CmakeSettings.json now supports inherited environments. This feature enables you to (1) inherit default environments and (2) create custom environment variables that are passed to CMake.exe when it runs.
247+
CMakeSettings.json now supports inherited environments. This feature enables you to (1) inherit default environments and (2) create custom environment variables that are passed to CMake.exe when it runs.
248248

249249
```json
250250
"inheritEnvironments": [ "msvc_x64_x64" ]
@@ -266,7 +266,7 @@ The following table shows the default values and their command line equivalents:
266266
|msvc_arm64_x64|Compile for ARM64 using 64-bit tools|
267267

268268
### Custom environment variables
269-
In CmakeSettings.json, you can define custom environment variables globally or per-configuration in the **environments** property. The following example defines one global variable, **BuildDir**, which is inherited in both the x86-Debug and x64-Debug configurations. Each configuration uses the variable to specify the value for the **buildRoot** property for that configuration. Note also how each configuration uses the **inheritEnvironments** property to specify a variable that applies only to that configuration.
269+
In CMakeSettings.json, you can define custom environment variables globally or per-configuration in the **environments** property. The following example defines one global variable, **BuildDir**, which is inherited in both the x86-Debug and x64-Debug configurations. Each configuration uses the variable to specify the value for the **buildRoot** property for that configuration. Note also how each configuration uses the **inheritEnvironments** property to specify a variable that applies only to that configuration.
270270

271271
```json
272272
{
@@ -285,8 +285,7 @@ In CmakeSettings.json, you can define custom environment variables globally or p
285285
"configurationType": "Debug",
286286
// Inherit the defaults for using the MSVC x86 compiler.
287287
"inheritEnvironments": [ "msvc_x86" ],
288-
"buildRoot": "${env.BuildDir}\\${name}"
289-
},
288+
"buildRoot": "${env.BuildDir}\\${name}"M },
290289
{
291290
"name": "x64-Debug",
292291
"generator": "Ninja",
@@ -341,7 +340,7 @@ In the next example, the x86-Debug configuration defines its own value for the *
341340
}
342341
```
343342

344-
## Cmake configure step
343+
## CMake configure step
345344

346345
When significant changes are made to the CMakeSettings.json or to CMakeLists.txt files, Visual Studio automatically re-runs the CMake configure step. If the configure step finishes without errors, the information that is collected is available in C++ IntelliSense and language services and also in build and debug operations.
347346

0 commit comments

Comments
 (0)