summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorCraig Scott <craig.scott@crascit.com>2020-10-23 10:35:51 (GMT)
committerKitware Robot <kwrobot@kitware.com>2020-10-23 10:36:03 (GMT)
commit5d20e6d8036a158df8b512682d394492ab7161b9 (patch)
tree9ae6c8380b697bba13fa7178e73efdd634075fc5 /Source
parent6d306a42da59e1277942078a5df7863c489e9600 (diff)
parent25742c589c80724b1d03357e0c911c443ab991f4 (diff)
downloadCMake-5d20e6d8036a158df8b512682d394492ab7161b9.zip
CMake-5d20e6d8036a158df8b512682d394492ab7161b9.tar.gz
CMake-5d20e6d8036a158df8b512682d394492ab7161b9.tar.bz2
Merge topic 'cmake-presets-source-dir-name'
25742c589c CMakePresets.json: Add ${sourceDirName} macro Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: Craig Scott <craig.scott@crascit.com> Merge-request: !5386
Diffstat (limited to 'Source')
-rw-r--r--Source/cmCMakePresetsFile.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/cmCMakePresetsFile.cxx b/Source/cmCMakePresetsFile.cxx
index b3bb6df..69bae7f 100644
--- a/Source/cmCMakePresetsFile.cxx
+++ b/Source/cmCMakePresetsFile.cxx
@@ -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;