diff options
author | Marc Chevrier <marc.chevrier@gmail.com> | 2020-04-18 09:27:40 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2020-04-18 09:27:52 (GMT) |
commit | 40d17356811dcf9e525e6adf7bd723ee8c678ebe (patch) | |
tree | 6e8d31e5026c68694b01f7955235fb6cc82b5c39 /Source/CTest/cmCTestSubmitCommand.cxx | |
parent | fbf8db89e4e9441462a19b4684ddd51aa8cbe7b5 (diff) | |
parent | aacd4e4a90a3afb23d681063d2ecba719f1adab8 (diff) | |
download | CMake-40d17356811dcf9e525e6adf7bd723ee8c678ebe.zip CMake-40d17356811dcf9e525e6adf7bd723ee8c678ebe.tar.gz CMake-40d17356811dcf9e525e6adf7bd723ee8c678ebe.tar.bz2 |
Merge topic 'add-contains-to-cmext-algorithm'
aacd4e4a90 Refactoring: add cm::contains to <cmext/algorithm>
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4606
Diffstat (limited to 'Source/CTest/cmCTestSubmitCommand.cxx')
-rw-r--r-- | Source/CTest/cmCTestSubmitCommand.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Source/CTest/cmCTestSubmitCommand.cxx b/Source/CTest/cmCTestSubmitCommand.cxx index acb75b2..5b2f2e6 100644 --- a/Source/CTest/cmCTestSubmitCommand.cxx +++ b/Source/CTest/cmCTestSubmitCommand.cxx @@ -8,10 +8,10 @@ #include <cm/memory> #include <cm/vector> +#include <cmext/algorithm> #include "cm_static_string_view.hxx" -#include "cmAlgorithms.h" #include "cmCTest.h" #include "cmCTestSubmitHandler.h" #include "cmCommand.h" @@ -172,8 +172,10 @@ void cmCTestSubmitCommand::BindArguments() void cmCTestSubmitCommand::CheckArguments( std::vector<std::string> const& keywords) { - this->PartsMentioned = !this->Parts.empty() || cmContains(keywords, "PARTS"); - this->FilesMentioned = !this->Files.empty() || cmContains(keywords, "FILES"); + this->PartsMentioned = + !this->Parts.empty() || cm::contains(keywords, "PARTS"); + this->FilesMentioned = + !this->Files.empty() || cm::contains(keywords, "FILES"); cm::erase_if(this->Parts, [this](std::string const& arg) -> bool { cmCTest::Part p = this->CTest->GetPartFromName(arg.c_str()); |