mirror of
https://github.com/Kitware/CMake.git
synced 2026-02-19 13:40:42 -06:00
cmake: Make entire in-progress check stack available internally
Represent it as a `vector` so we can iterate over the whole stack.
This commit is contained in:
@@ -9,7 +9,6 @@
|
|||||||
#include <map>
|
#include <map>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <set>
|
#include <set>
|
||||||
#include <stack>
|
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <unordered_set>
|
#include <unordered_set>
|
||||||
#include <utility>
|
#include <utility>
|
||||||
@@ -472,13 +471,13 @@ public:
|
|||||||
}
|
}
|
||||||
std::string GetTopCheckInProgressMessage()
|
std::string GetTopCheckInProgressMessage()
|
||||||
{
|
{
|
||||||
auto message = this->CheckInProgressMessages.top();
|
auto message = this->CheckInProgressMessages.back();
|
||||||
this->CheckInProgressMessages.pop();
|
this->CheckInProgressMessages.pop_back();
|
||||||
return message;
|
return message;
|
||||||
}
|
}
|
||||||
void PushCheckInProgressMessage(std::string message)
|
void PushCheckInProgressMessage(std::string message)
|
||||||
{
|
{
|
||||||
this->CheckInProgressMessages.emplace(std::move(message));
|
this->CheckInProgressMessages.emplace_back(std::move(message));
|
||||||
}
|
}
|
||||||
|
|
||||||
//! Should `message` command display context.
|
//! Should `message` command display context.
|
||||||
@@ -773,7 +772,7 @@ private:
|
|||||||
bool LogLevelWasSetViaCLI = false;
|
bool LogLevelWasSetViaCLI = false;
|
||||||
bool LogContext = false;
|
bool LogContext = false;
|
||||||
|
|
||||||
std::stack<std::string> CheckInProgressMessages;
|
std::vector<std::string> CheckInProgressMessages;
|
||||||
|
|
||||||
std::unique_ptr<cmGlobalGenerator> GlobalGenerator;
|
std::unique_ptr<cmGlobalGenerator> GlobalGenerator;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user