Skip to content

Commit bcc3b7b

Browse files
author
mikeblome
committed
fixed formatting
1 parent 7663a1e commit bcc3b7b

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

docs/build/cmake-projects-in-visual-studio.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,12 @@ ms.assetid: 444d50df-215e-4d31-933a-b41841f186f8
88

99
CMake is a cross-platform, open-source tool for defining build processes that run on multiple platforms. This article assumes you are familiar with CMake. You can learn more about it at [Build, Test and Package Your Software With CMake](https://cmake.org/).
1010

11-
CMake has become more and more integrated with Visual Studio over the past few releases. To see the correct information for the version you are using, make sure the version selector in the upper left of this page is set correctly.
11+
> [!NOTE]
12+
> CMake has become more and more integrated with Visual Studio over the past few releases. To see the correct information for the version you are using, make sure the version selector in the upper left of this page is set correctly.
1213
1314
::: moniker range="vs-2019"
1415

15-
Visual Studio 2019 introduces the **CMake Settings editor** and other improvements over Visual Studio 2017. The **Visual C++ Tools for CMake** component uses the **Open Folder** feature to enable the IDE to consume CMake project files (such as CMakeLists.txt) directly for the purposes of IntelliSense and browsing. Both Ninja and Visual Studio generators are supported. If you use a Visual Studio generator, a temporary project file is generated and passed to msbuild.exe, but is never loaded for IntelliSense or browsing purposes. You can import an existing CMake cache; Visual Studio automatically extracts customized variables and creates a pre-populated **CMakeSettings.json** file.
16+
Visual Studio 2019 introduces the **CMake Settings editor** and other improvements over Visual Studio 2017. The **Visual C++ Tools for CMake** component uses the **Open Folder** feature to enable the IDE to consume CMake project files (such as CMakeLists.txt) directly for the purposes of IntelliSense and browsing. Both Ninja and Visual Studio generators are supported. If you use a Visual Studio generator, a temporary project file is generated and passed to msbuild.exe, but is never loaded for IntelliSense or browsing purposes. You can also import an existing CMake cache.
1617

1718
## Installation
1819

@@ -170,7 +171,7 @@ If you have installed CMake from the Visual Studio Installer, you can run it fro
170171

171172
::: moniker range="vs-2017"
172173

173-
Visual Studio 2017 has rich support for CMake, including [cross-platform CMake projects](../linux/cmake-linux-project.md). The **Visual C++ Tools for CMake** component uses the **Open Folder** feature to enable the IDE to consume CMake project files (such as CMakeLists.txt) directly for the purposes of IntelliSense and browsing. Both Ninja and Visual Studio generators are supported. If you use a Visual Studio generator, a temporary project file is generated and passed to msbuild.exe, but is never loaded for IntelliSense or browsing purposes. You can import an existing CMake cache; Visual Studio automatically extracts customized variables and creates a pre-populated **CMakeSettings.json** file.
174+
Visual Studio 2017 has rich support for CMake, including [cross-platform CMake projects](../linux/cmake-linux-project.md). The **Visual C++ Tools for CMake** component uses the **Open Folder** feature to enable the IDE to consume CMake project files (such as CMakeLists.txt) directly for the purposes of IntelliSense and browsing. Both Ninja and Visual Studio generators are supported. If you use a Visual Studio generator, a temporary project file is generated and passed to msbuild.exe, but is never loaded for IntelliSense or browsing purposes. You also can import an existing CMake cache.
174175

175176
## Installation
176177

docs/build/cmakesettings-reference.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ When the active configuration specifies a Visual Studio generator, by default MS
6161

6262
```json
6363
"buildCommandArgs": "-m:8 -v:minimal -p:PreferredToolArchitecture=x64"
64-
```
64+
```
6565

6666
- `configurationType`: specifies the build type configuration for the selected generator. May be one of:
6767

@@ -102,7 +102,7 @@ When the active configuration specifies a Visual Studio generator, by default MS
102102

103103
- `cacheRoot`: specifies the path to a CMake cache. This directory should contain an existing CMakeCache.txt file.
104104

105-
Additional settings are available for CMake Linux projects.
105+
### Additional settings for CMake Linux projects.
106106

107107
- `remoteMachineName`: specifies the name of the remote Linux machine that hosts CMake, builds, and the debugger. Use the Connection Manager for adding new Linux machines. Supported macros include `${defaultRemoteMachineName}`.
108108
- `remoteCopySourcesOutputVerbosity`: specifies the verbosity level of the source copying operation to the remote machine. May be one of ""Normal", "Verbose", or "Diagnostic".
@@ -140,7 +140,8 @@ Note that if you do not define the `"type"`, the "STRING" type will be assumed b
140140

141141
## Environment variables
142142

143-
`CMakeSettings.json` also supports consuming environment variables in any of its properties mentioned above. The syntax to use is `${env.FOO}` to expand the environment variable %FOO%.
143+
`CMakeSettings.json` also supports consuming environment variables in any of its properties mentioned above. The syntax to use is `${env.FOO}` to expand the environment variable %FOO%.
144+
144145
You also have access to built-in macros inside this file:
145146

146147
- `${workspaceRoot}` – provides the full path of the workspace folder

0 commit comments

Comments
 (0)