diff options
| author | Brad King <brad.king@kitware.com> | 2020-01-28 16:35:15 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-01-28 16:35:24 (GMT) |
| commit | a4d7a79beb3c3431f900e184678bdc66133653bf (patch) | |
| tree | 05d5f0983e5b1ef2becb5d7fc96df473de282446 /Source/cmake.h | |
| parent | 7706b6a71406b535ffe2f707647126eac4a8c767 (diff) | |
| parent | ccaa0bccc42a31f7515c6f85a0601ac0ad006e96 (diff) | |
| download | CMake-a4d7a79beb3c3431f900e184678bdc66133653bf.zip CMake-a4d7a79beb3c3431f900e184678bdc66133653bf.tar.gz CMake-a4d7a79beb3c3431f900e184678bdc66133653bf.tar.bz2 | |
Merge topic 'ninja-1.10'
ccaa0bccc4 Ninja: Do not clean metadata when re-generating inside a running build
657820a00b Ninja: Track when running to re-generate during a build
b12b013028 Ninja: Factor metadata cleanup into dedicated method
5d92e60d81 Ninja: Skip cleandead and recompact if build.ninja is missing
dd0a4718fd Ninja: Fix CMAKE_NINJA_OUTPUT_PATH_PREFIX with Ninja 1.10
0944caaebb Tests: Fix RunCMake.CMP0037 test with Ninja 1.10
9d4883cce5 Tests: Fix RunCMake.Ninja test for Ninja 1.10
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4290
Diffstat (limited to 'Source/cmake.h')
| -rw-r--r-- | Source/cmake.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/cmake.h b/Source/cmake.h index c65b821..35425ec 100644 --- a/Source/cmake.h +++ b/Source/cmake.h @@ -547,6 +547,8 @@ public: } cmStateSnapshot GetCurrentSnapshot() const { return this->CurrentSnapshot; } + bool GetRegenerateDuringBuild() const { return this->RegenerateDuringBuild; } + protected: void RunCheckForUnusedVariables(); int HandleDeleteCacheVariables(const std::string& var); @@ -621,6 +623,7 @@ private: FileExtensions FortranFileExtensions; bool ClearBuildSystem = false; bool DebugTryCompile = false; + bool RegenerateDuringBuild = false; std::unique_ptr<cmFileTimeCache> FileTimeCache; std::string GraphVizFile; InstalledFilesMap InstalledFiles; |