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

Merge topic 'cmake-presets-no-binary-dir-no-s' into release-3.21

Browse Source 
aa874dc609 CMakePresets.json: Fix expansion issue with empty binaryDir

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6358
This commit is contained in:
Brad King
2021-07-19 16:58:49 +00:00
committed by Kitware Robot
parent 095f49ec36 aa874dc609
commit 4ff651eb52
4 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Source/cmCMakePresetsFile.cxx
View File

@@ -197,11 +197,13 @@ bool ExpandMacros(const cmCMakePresetsFile& file,
std::string binaryDir = preset.BinaryDir;
CHECK_EXPAND(out, binaryDir, macroExpanders, file.GetVersion(preset))
if (!cmSystemTools::FileIsFullPath(binaryDir)) {
binaryDir = cmStrCat(file.SourceDir, '/', binaryDir);
if (!binaryDir.empty()) {
if (!cmSystemTools::FileIsFullPath(binaryDir)) {
binaryDir = cmStrCat(file.SourceDir, '/', binaryDir);
}
out->BinaryDir = cmSystemTools::CollapseFullPath(binaryDir);
cmSystemTools::ConvertToUnixSlashes(out->BinaryDir);
}
out->BinaryDir = cmSystemTools::CollapseFullPath(binaryDir);
cmSystemTools::ConvertToUnixSlashes(out->BinaryDir);
if (!preset.InstallDir.empty()) {
std::string installDir = preset.InstallDir;

4
Tests/RunCMake/CMakePresets/OptionalBinaryDirFieldNoS.cmake Normal file
View File

@@ -0,0 +1,4 @@
include(${CMAKE_CURRENT_LIST_DIR}/TestVariable.cmake)
get_filename_component(_parent_dir "${CMAKE_SOURCE_DIR}" DIRECTORY)
test_variable(CMAKE_BINARY_DIR "" "${_parent_dir}/OptionalBinaryDirFieldNoS-build")

9
Tests/RunCMake/CMakePresets/OptionalBinaryDirFieldNoS.json.in Normal file
View File

@@ -0,0 +1,9 @@
{
"version": 3,
"configurePresets": [
{
"name": "OptionalBinaryDirFieldNoS",
"generator": "@RunCMake_GENERATOR@"
}
]
}

5
Tests/RunCMake/CMakePresets/RunCMakeTest.cmake
View File

@@ -312,6 +312,11 @@ unset(CMakePresets_FILE)
# Test optional generator and buildDir fields
run_cmake_presets(OptionalBinaryDirField -B "${RunCMake_BINARY_DIR}/OptionalBinaryDirField/build")
run_cmake_presets(OptionalGeneratorField -G "${RunCMake_GENERATOR}")
set(CMakePresets_NO_S_ARG TRUE)
set(CMakePresets_SOURCE_ARG "../OptionalBinaryDirFieldNoS")
run_cmake_presets(OptionalBinaryDirFieldNoS)
unset(CMakePresets_SOURCE_ARG)
unset(CMakePresets_NO_S_ARG)
# Test the example from the documentation
file(READ "${RunCMake_SOURCE_DIR}/../../../Help/manual/presets/example.json" _example)