mirror of
https://github.com/Kitware/CMake.git
synced 2026-04-29 18:51:05 -05:00
Merge topic 'cxx23'
a0fabc4769cmGlobalGeneratorFactory: Provide complete cmGlobalGenerator to deleter85627a93c9cmCTestBuildCommand: Avoid requiring complete cmGlobalGenerator type publicly641c02a3cecmList: Avoid using operator-> on input iteratore4483b8871Tests: Avoid compiling call to dap::optional<dap::string>(nullptr) Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Acked-by: scivision <michael@scivision.dev> Merge-request: !8950
This commit is contained in:
@@ -3,11 +3,13 @@
|
||||
#include "cmCTestBuildCommand.h"
|
||||
|
||||
#include <sstream>
|
||||
#include <utility>
|
||||
|
||||
#include <cmext/string_view>
|
||||
|
||||
#include "cmCTest.h"
|
||||
#include "cmCTestBuildHandler.h"
|
||||
#include "cmCommand.h"
|
||||
#include "cmGlobalGenerator.h"
|
||||
#include "cmMakefile.h"
|
||||
#include "cmMessageType.h"
|
||||
@@ -18,6 +20,14 @@
|
||||
|
||||
class cmExecutionStatus;
|
||||
|
||||
std::unique_ptr<cmCommand> cmCTestBuildCommand::Clone()
|
||||
{
|
||||
auto ni = cm::make_unique<cmCTestBuildCommand>();
|
||||
ni->CTest = this->CTest;
|
||||
ni->CTestScriptHandler = this->CTestScriptHandler;
|
||||
return std::unique_ptr<cmCommand>(std::move(ni));
|
||||
}
|
||||
|
||||
void cmCTestBuildCommand::BindArguments()
|
||||
{
|
||||
this->cmCTestHandlerCommand::BindArguments();
|
||||
|
||||
@@ -5,14 +5,13 @@
|
||||
#include "cmConfigure.h" // IWYU pragma: keep
|
||||
|
||||
#include <string>
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
|
||||
#include <cm/memory>
|
||||
|
||||
#include "cmCTestHandlerCommand.h"
|
||||
#include "cmCommand.h"
|
||||
|
||||
class cmCommand;
|
||||
class cmCTestBuildHandler;
|
||||
class cmCTestGenericHandler;
|
||||
class cmExecutionStatus;
|
||||
@@ -31,13 +30,7 @@ public:
|
||||
/**
|
||||
* This is a virtual constructor for the command.
|
||||
*/
|
||||
std::unique_ptr<cmCommand> Clone() override
|
||||
{
|
||||
auto ni = cm::make_unique<cmCTestBuildCommand>();
|
||||
ni->CTest = this->CTest;
|
||||
ni->CTestScriptHandler = this->CTestScriptHandler;
|
||||
return std::unique_ptr<cmCommand>(std::move(ni));
|
||||
}
|
||||
std::unique_ptr<cmCommand> Clone() override;
|
||||
|
||||
/**
|
||||
* The name of the command as specified in CMakeList.txt.
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
#include "cmConfigure.h" // IWYU pragma: keep
|
||||
|
||||
#include "cmDocumentationEntry.h" // IWYU pragma: export
|
||||
#include "cmGlobalGenerator.h" // IWYU pragma: keep
|
||||
|
||||
// TODO The following headers are parts of the `cmGlobalGeneratorFactory`
|
||||
// public API, so could be defined as export to IWYU
|
||||
@@ -13,7 +14,6 @@
|
||||
|
||||
#include <cm/memory>
|
||||
|
||||
class cmGlobalGenerator;
|
||||
class cmake;
|
||||
|
||||
/** \class cmGlobalGeneratorFactory
|
||||
|
||||
+1
-1
@@ -1192,7 +1192,7 @@ private:
|
||||
}
|
||||
} else {
|
||||
for (; first != last; ++first) {
|
||||
if (!first->empty() || emptyElements == EmptyElements::Yes) {
|
||||
if (!(*first).empty() || emptyElements == EmptyElements::Yes) {
|
||||
insertPos = container.insert(insertPos, *first);
|
||||
++insertPos;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user