mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-11 00:11:07 -06:00
Code Issues Packages Projects Releases Wiki Activity

CMakePresets.json: Add ${sourceDirName} macro

Browse Source 
Fixes: #21312
This commit is contained in:
Kyle Edwards
2020-10-16 15:31:01 -04:00
parent 609122007d
commit 25742c589c
5 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Help/manual/cmake-presets.7.rst
View File

@@ -308,6 +308,11 @@ Format
Path to the project source directory's parent directory.
``${sourceDirName}``
The last filename component of ``${sourceDir}``. For example, if
``${sourceDir}`` is ``/path/to/source``, this would be ``source``.
``${presetName}``
Name specified in the preset's ``name`` field.

4
Source/cmCMakePresetsFile.cxx
View File

@@ -638,6 +638,10 @@ ExpandMacroResult ExpandMacro(const cmCMakePresetsFile& file,
out += cmSystemTools::GetParentDirectory(file.SourceDir);
return ExpandMacroResult::Ok;
}
if (macroName == "sourceDirName") {
out += cmSystemTools::GetFilenameName(file.SourceDir);
return ExpandMacroResult::Ok;
}
if (macroName == "presetName") {
out += preset.Name;
return ExpandMacroResult::Ok;

1
Tests/RunCMake/CMakePresets/CMakePresets.json.in
View File

@@ -72,6 +72,7 @@
"TEST_DOLLAR": {
"value": "${dollar}"
},
"TEST_SOURCE_DIR_NAME": "${sourceDirName}",
"TEST_ENV_REF": "$env{TEST_ENV_REF}",
"TEST_ENV": "$env{TEST_ENV}",
"TEST_D_ENV_REF": "$env{TEST_D_ENV_REF}",

1
Tests/RunCMake/CMakePresets/Good-stdout.txt
View File

@@ -26,6 +26,7 @@ Preset CMake variables:
TEST_PRESET_NAME:STRING="xGoodx"
TEST_SOURCE_DIR:PATH="[^
]*/Tests/RunCMake/CMakePresets/Good"
TEST_SOURCE_DIR_NAME="Good"
TEST_SOURCE_LIST:FILEPATH="[^
]*/Tests/RunCMake/CMakePresets/Good/CMakeLists\.txt"
TEST_SOURCE_PARENT_DIR:PATH="[^

1
Tests/RunCMake/CMakePresets/Good.cmake
View File

@@ -17,6 +17,7 @@ test_variable(TEST_UNTYPED_BOOL_FALSE "UNINITIALIZED" "FALSE")
test_variable(TEST_PRESET_NAME "STRING" "xGoodx")
test_variable(TEST_GENERATOR "UNINITIALIZED" "x${CMAKE_GENERATOR}x")
test_variable(TEST_DOLLAR "UNINITIALIZED" "$")
test_variable(TEST_SOURCE_DIR_NAME "UNINITIALIZED" "Good")
test_variable(TEST_ENV_REF "UNINITIALIZED" "Environment variable")
test_variable(TEST_ENV "UNINITIALIZED" "Environment variable")
test_variable(TEST_D_ENV_REF "UNINITIALIZED" "xEnvironment variablex")