diff options
| author | Ben Boeckel <ben.boeckel@kitware.com> | 2023-08-08 03:10:15 (GMT) |
|---|---|---|
| committer | Ben Boeckel <ben.boeckel@kitware.com> | 2023-08-08 18:25:01 (GMT) |
| commit | 4980f47b4691ad7f4b4a579484fb43bed4db5c99 (patch) | |
| tree | c65b40bd7bc8fb03b8dd702d98f85cc3d78f291c | |
| parent | b334dc84c3ecc85a6e0856bc23278d435d820060 (diff) | |
| download | CMake-4980f47b4691ad7f4b4a579484fb43bed4db5c99.zip CMake-4980f47b4691ad7f4b4a579484fb43bed4db5c99.tar.gz CMake-4980f47b4691ad7f4b4a579484fb43bed4db5c99.tar.bz2 | |
cmGlobalGenerator: always support generating rule hashes
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index 8a8d2e0..9af6e9b 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -30,6 +30,7 @@ #include "cmAlgorithms.h" #include "cmCPackPropertiesGenerator.h" #include "cmComputeTargetDepends.h" +#include "cmCryptoHash.h" #include "cmCustomCommand.h" #include "cmCustomCommandLines.h" #include "cmDuration.h" @@ -64,7 +65,6 @@ # include <cm3p/json/value.h> # include <cm3p/json/writer.h> -# include "cmCryptoHash.h" # include "cmQtAutoGenGlobalInitializer.h" #endif @@ -3222,7 +3222,6 @@ std::set<std::string> const& cmGlobalGenerator::GetDirectoryContent( void cmGlobalGenerator::AddRuleHash(const std::vector<std::string>& outputs, std::string const& content) { -#if !defined(CMAKE_BOOTSTRAP) // Ignore if there are no outputs. if (outputs.empty()) { return; @@ -3242,20 +3241,14 @@ void cmGlobalGenerator::AddRuleHash(const std::vector<std::string>& outputs, // Associate the hash with this output. this->RuleHashes[fname] = hash; -#else - (void)outputs; - (void)content; -#endif } void cmGlobalGenerator::CheckRuleHashes() { -#if !defined(CMAKE_BOOTSTRAP) std::string home = this->GetCMakeInstance()->GetHomeOutputDirectory(); std::string pfile = cmStrCat(home, "/CMakeFiles/CMakeRuleHashes.txt"); this->CheckRuleHashes(pfile, home); this->WriteRuleHashes(pfile); -#endif } void cmGlobalGenerator::CheckRuleHashes(std::string const& pfile, |