mirror of
https://github.com/reactos/CMake.git
synced 2025-03-04 18:07:27 +00:00
BUG: Fix resolving of infinite loops while CMakeSetup/ccmake still running
This commit is contained in:
parent
c63c23a617
commit
34115a5989
@ -1065,6 +1065,8 @@ int cmake::Configure()
|
|||||||
m_GlobalGenerator->ClearEnabledLanguages();
|
m_GlobalGenerator->ClearEnabledLanguages();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
this->CleanupWrittenFiles();
|
||||||
|
|
||||||
// actually do the configure
|
// actually do the configure
|
||||||
m_GlobalGenerator->Configure();
|
m_GlobalGenerator->Configure();
|
||||||
|
|
||||||
@ -1426,3 +1428,8 @@ bool cmake::HasWrittenFile(const char* file)
|
|||||||
{
|
{
|
||||||
return m_WrittenFiles.find(file) != m_WrittenFiles.end();
|
return m_WrittenFiles.find(file) != m_WrittenFiles.end();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void cmake::CleanupWrittenFiles()
|
||||||
|
{
|
||||||
|
m_WrittenFiles.clear();
|
||||||
|
}
|
||||||
|
@ -261,6 +261,7 @@ class cmake
|
|||||||
///! Get the list of files written by CMake using FILE(WRITE / WRITE_FILE
|
///! Get the list of files written by CMake using FILE(WRITE / WRITE_FILE
|
||||||
void AddWrittenFile(const char* file);
|
void AddWrittenFile(const char* file);
|
||||||
bool HasWrittenFile(const char* file);
|
bool HasWrittenFile(const char* file);
|
||||||
|
void CleanupWrittenFiles();
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
typedef cmGlobalGenerator* (*CreateGeneratorFunctionType)();
|
typedef cmGlobalGenerator* (*CreateGeneratorFunctionType)();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user