diff options
| author | Brad King <brad.king@kitware.com> | 2020-01-13 15:30:57 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-01-13 15:31:05 (GMT) |
| commit | 95e3c8b440a40a6ed5d61e19c3a9a67989f62dcc (patch) | |
| tree | 033c1bf8de3207dc2d26c7b1044482a909aad2a1 /Source/cmMakefile.cxx | |
| parent | 9a5d399725cbb7012ca7b1f77bd405090c60691d (diff) | |
| parent | 968477517edb030cee7f9160286b31d4cda4a516 (diff) | |
| download | CMake-95e3c8b440a40a6ed5d61e19c3a9a67989f62dcc.zip CMake-95e3c8b440a40a6ed5d61e19c3a9a67989f62dcc.tar.gz CMake-95e3c8b440a40a6ed5d61e19c3a9a67989f62dcc.tar.bz2 | |
Merge topic 'refactoring-STL-erase_if'
968477517e Refactoring: suppress cmEraseIf in favor of cm::erase_if
348b60d19d STL support: add c++20 std::erase and std::erase_if functions
Acked-by: Kitware Robot <kwrobot@kitware.com>
Rejected-by: Leonid Pospelov <pospelovlm@yandex.ru>
Merge-request: !4192
Diffstat (limited to 'Source/cmMakefile.cxx')
| -rw-r--r-- | Source/cmMakefile.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 79cf5a1..7435e47 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -17,6 +17,7 @@ #include <cm/iterator> #include <cm/memory> #include <cm/optional> +#include <cm/vector> #include <cmext/algorithm> #include "cmsys/FStream.hxx" @@ -840,12 +841,12 @@ void cmMakefile::DoGenerate(cmLocalGenerator& lg) // we don't want cmake to re-run if a configured file is created and deleted // during processing as that would make it a transient file that can't // influence the build process - cmEraseIf(this->OutputFiles, file_not_persistent()); + cm::erase_if(this->OutputFiles, file_not_persistent()); // if a configured file is used as input for another configured file, // and then deleted it will show up in the input list files so we // need to scan those too - cmEraseIf(this->ListFiles, file_not_persistent()); + cm::erase_if(this->ListFiles, file_not_persistent()); } // Generate the output file |