diff options
| author | Brad King <brad.king@kitware.com> | 2023-06-20 13:25:28 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-06-20 13:25:39 (GMT) |
| commit | e12d6d2503ee0099783bd7b97e39b973cfd212e7 (patch) | |
| tree | a4a11f521e29e6bcfeed94c21d3daaa39d5d5e6f | |
| parent | 8a99acd289e405c42e4b129cc6cf413fffd88769 (diff) | |
| parent | 1cfaed0684e7e26687a3a0a607925456dc656c57 (diff) | |
| download | CMake-e12d6d2503ee0099783bd7b97e39b973cfd212e7.zip CMake-e12d6d2503ee0099783bd7b97e39b973cfd212e7.tar.gz CMake-e12d6d2503ee0099783bd7b97e39b973cfd212e7.tar.bz2 | |
Merge topic 'cmList-SUBLIST-regression' into release-3.27
1cfaed0684 list(): restore SUBLIST behavior
Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !8569
| -rw-r--r-- | Source/cmList.h | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/list/SUBLIST.cmake | 51 |
2 files changed, 52 insertions, 1 deletions
diff --git a/Source/cmList.h b/Source/cmList.h index d9ce951..eba0400 100644 --- a/Source/cmList.h +++ b/Source/cmList.h @@ -322,7 +322,7 @@ public: // extract sublist in range [first, last) cmList sublist(const_iterator first, const_iterator last) const { - return cmList{ first, last }; + return cmList{ first, last, ExpandElements::No, EmptyElements::Yes }; } // Extract sublist in range [first, last) // Throw std::out_of_range if pos is invalid diff --git a/Tests/RunCMake/list/SUBLIST.cmake b/Tests/RunCMake/list/SUBLIST.cmake index fd15c28..6a33add 100644 --- a/Tests/RunCMake/list/SUBLIST.cmake +++ b/Tests/RunCMake/list/SUBLIST.cmake @@ -44,3 +44,54 @@ list(SUBLIST mylist 1 -1 result) if (NOT result STREQUAL "bravo;charlie;delta") message (FATAL_ERROR "SUBLIST is \"${result}\", expected is \"bravo;charlie;delta\"") endif() + + +set(mylist ";;") + +unset(result) +list(SUBLIST mylist 0 0 result) + +if (NOT result STREQUAL "") + message (FATAL_ERROR "SUBLIST is \"${result}\", expected is \"\"") +endif() + +unset(result) +list(SUBLIST mylist 0 1 result) + +if (NOT result STREQUAL "") + message (FATAL_ERROR "SUBLIST is \"${result}\", expected is \"\"") +endif() + +unset(result) +list(SUBLIST mylist 0 2 result) + +if (NOT result STREQUAL ";") + message (FATAL_ERROR "SUBLIST is \"${result}\", expected is \";\"") +endif() + +unset(result) +list(SUBLIST mylist 0 3 result) + +if (NOT result STREQUAL ";;") + message (FATAL_ERROR "SUBLIST is \"${result}\", expected is \";;\"") +endif() + + +set(mylist [[a\;b;c\;d;e]]) + +unset(result) +list(SUBLIST mylist 1 2 result) + +if (NOT result STREQUAL "c;d;e") + message (FATAL_ERROR "SUBLIST is \"${result}\", expected is \"c;d;e\"") +endif() + + +set(mylist [[a\;b;c\\;d;e;f;g;h]]) + +unset(result) +list(SUBLIST mylist 1 -1 result) + +if (NOT result STREQUAL "c\\;d;e;f;g;h") + message (FATAL_ERROR "SUBLIST is \"${result}\", expected is \"c\\;d;e;f;g;h\"") +endif() |