Skip to content

Commit 271bead

Browse files
author
mikeblome
committed
cmake edits
1 parent 5929538 commit 271bead

4 files changed

Lines changed: 8 additions & 6 deletions

File tree

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "CMake Projects in Visual C++ | Microsoft Docs"
33
ms.custom: ""
4-
ms.date: "09/26/2018"
4+
ms.date: "10/18/2018"
55
ms.reviewer: ""
66
ms.suite: ""
77
ms.technology: ["cpp-ide"]
@@ -79,7 +79,7 @@ Not everything in the cache is imported. Properties such as the generator and t
7979
To build a CMake project, you have these choices:
8080

8181
1. Select the target in the **Debug** dropdown and press **F5**, or click the **Run** (green triangle) button. The project automatically builds first, just like a Visual Studio solution.
82-
1. Right click on the CMakeLists.txt and select **Build** from the context menu. If you have multiple targets in your folder structure, you can choose to build all or only one specific target, or
82+
1. Right click on the CMakeLists.txt and select **Build** from the context menu. If you have multiple targets in your folder structure, you can choose to build all or only one specific target.
8383
1. From the main menu, select **Build | Build Solution** (**F7** or **Ctrl+Shift+B**). Make sure that a CMake target is already selected in the **Startup Item** dropdown in the **General** toolbar.
8484

8585
![CMake build menu command](media/cmake-build-menu.png "CMake build command menu")
@@ -205,7 +205,7 @@ To specify a Visual Studio generator, open the CMakeSettings.json from the main
205205

206206
1. **buildRoot**: maps to **-DCMAKE_BINARY_DIR** switch and specifies where the CMake cache will be created. If the folder does not exist, it is created.
207207

208-
1. **variables**: contains a name-value pair of CMake variables that will get passed as **-D**_name_**=**_value_ to CMake. If your CMake project build instructions specify the addition of any variables directly to the CMake cache file, it is recommended that you add them here instead. The following example shows how to specify the name-value pairs:
208+
1. **variables**: contains a name-value pair of CMake variables that will get passed as **-D** *_name_=_value_* to CMake. If your CMake project build instructions specify the addition of any variables directly to the CMake cache file, it is recommended that you add them here instead. The following example shows how to specify the name-value pairs:
209209

210210
```json
211211
"variables": [
@@ -275,7 +275,7 @@ CMakeSettings.json now supports inherited environments. This feature enables you
275275

276276
The example above is the same as running the **Developer Command Prompt for VS 2017** with the **-arch=amd64 -host_arch=amd64** arguments.
277277

278-
The following table shows the default values and their command line equivalents:
278+
The following table shows the default values:
279279

280280
|Context Name|Description|
281281
|-----------|-----------------|

‎docs/linux/TOC.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# [Download, Install and Setup the Linux Development Workload](download-install-and-setup-the-linux-development-workload.md)
2-
# [Create a New Linux Project](create-a-new-linux-project.md)
32
# [Configure a Linux Project](configure-a-linux-project.md)
43
# [Configure a Linux CMake Project](cmake-linux-project.md)
4+
# [Create a New Linux Project](create-a-new-linux-project.md)
55
# [Connect to Your Remote Linux Computer](connect-to-your-remote-linux-computer.md)
66
# [Deploy, Run, and Debug Your Linux Project](deploy-run-and-debug-your-linux-project.md)
77
# [Linux Project Property Page Reference](prop-pages-linux.md)

‎docs/linux/download-install-and-setup-the-linux-development-workload.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ You can use the Visual Studio IDE in Windows to create, edit and debug C++ proje
1818

1919
## Visual Studio setup
2020

21-
1. Type "Visual Studio Installer" in the Windows search menu; look for it under the **Apps** results and double-click it. When the installer opens, choose **Modify**, and then click on the **Workloads** tab. Scroll down to **Other toolsets** and select the **Linux development with C++** workload.
21+
1. Type "Visual Studio Installer" in the Windows search box:
22+
![Windows search box](media/visual-studio-installer-search.png)
23+
2. Look for the installer under the **Apps** results and double-click it. When the installer opens, choose **Modify**, and then click on the **Workloads** tab. Scroll down to **Other toolsets** and select the **Linux development with C++** workload.
2224

2325
![Visual C++ for Linux Development workload](media/linuxworkload.png)
2426

8.76 KB
Loading

0 commit comments

Comments
 (0)