Skip to content

Commit d7163cd

Browse files
authored
Merge pull request #3653 from MicrosoftDocs/FromPublicMasterBranch
Confirm merge from FromPublicMasterBranch to master to sync with https://github.com/MicrosoftDocs/cpp-docs (branch master)
2 parents a4b63d7 + 600f059 commit d7163cd

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

docs/build/cmakesettings-reference.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,8 @@ The following macros can be used in *CMakeSettings.json*:
257257
- `${workspaceRoot}` – the full path of the workspace folder
258258
- `${workspaceHash}` – hash of workspace location; useful for creating a unique identifier for the current workspace (for example, to use in folder paths)
259259
- `${projectFile}` – the full path of the root CMakeLists.txt file
260-
- `${projectDir}` – the full path of the folder of the root CMakeLists.txt file
260+
- `${projectDir}` – the full path of the folder containing the root CMakeLists.txt file
261+
- `${projectDirName}` – the name of the folder containing the root CMakeLists.txt file
261262
- `${thisFile}` – the full path of the `CMakeSettings.json` file
262263
- `${name}` – the name of the configuration
263264
- `${generator}` – the name of the CMake generator used in this configuration

0 commit comments

Comments
 (0)