dilim/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-08-09 01:01:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bug/19436' into release-3.15

Browse Source 
Merge-request: !3497
This commit is contained in:
Craig Scott
2019-07-01 21:49:18 +10:00
parent 753373579e 822abf1265
commit 32dae26975
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmListCommand.cxx
View File

@@ -344,7 +344,7 @@ bool cmListCommand::HandlePopFrontCommand(std::vector<std::string> const& args)
auto vi = varArgsExpanded.begin();
for (; vi != varArgsExpanded.end() && ai != args.cend(); ++ai, ++vi) {
assert(!ai->empty());
this->Makefile->AddDefinition(*ai, varArgsExpanded.front().c_str());
this->Makefile->AddDefinition(*ai, vi->c_str());
}
varArgsExpanded.erase(varArgsExpanded.begin(), vi);
// Undefine the rest variables if the list gets empty earlier...

13
Tests/RunCMake/list/POP_FRONT.cmake
View File

@@ -77,3 +77,16 @@ endif()
if(NOT test STREQUAL "two")
message(FATAL_ERROR "`test` has unexpected value `${test}`")
endif()
# BUG 19436
set(myList a b c)
list(POP_FRONT myList first second)
if(NOT first STREQUAL "a")
message(FATAL_ERROR "BUG#19436: `first` has unexpected value `${first}`")
endif()
if(NOT second STREQUAL "b")
message(FATAL_ERROR "BUG#19436: `second` has unexpected value `${second}`")
endif()
if(NOT myList STREQUAL "c")
message(FATAL_ERROR "BUG#19436: `myList` has unexpected value `${myList}`")
endif()