diff options
| author | R2RT <artur.ryt@gmail.com> | 2018-11-04 21:53:44 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-11-05 13:29:10 (GMT) |
| commit | f92f93467ecc22419c981f8f5283c81fa9d8eb01 (patch) | |
| tree | b2ba067b2a149e669b5509a53ed95a034cb6ade4 | |
| parent | 112100da9033fdf678e83ac65580dc456b83a2cb (diff) | |
| download | CMake-f92f93467ecc22419c981f8f5283c81fa9d8eb01.zip CMake-f92f93467ecc22419c981f8f5283c81fa9d8eb01.tar.gz CMake-f92f93467ecc22419c981f8f5283c81fa9d8eb01.tar.bz2 | |
cmMakefile: Rename SuppressWatches to SuppressSideEffects
| -rw-r--r-- | Source/cmMakefile.cxx | 8 | ||||
| -rw-r--r-- | Source/cmMakefile.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 0a69d09..83139ba 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -67,7 +67,7 @@ cmMakefile::cmMakefile(cmGlobalGenerator* globalGenerator, this->WarnUnused = this->GetCMakeInstance()->GetWarnUnused(); this->CheckSystemVars = this->GetCMakeInstance()->GetCheckSystemVars(); - this->SuppressWatches = false; + this->SuppressSideEffects = false; // Setup the default include complaint regular expression (match nothing). this->ComplainFileRegularExpression = "^$"; @@ -2421,7 +2421,7 @@ const std::string* cmMakefile::GetDef(const std::string& name) const } #ifdef CMAKE_BUILD_WITH_CMAKE cmVariableWatch* vv = this->GetVariableWatch(); - if (vv && !this->SuppressWatches) { + if (vv && !this->SuppressSideEffects) { bool const watch_function_executed = vv->VariableAccessed(name, def ? cmVariableWatch::VARIABLE_READ_ACCESS @@ -2508,11 +2508,11 @@ const std::string& cmMakefile::ExpandVariablesInString( compareResults = true; // Suppress variable watches to avoid calling hooks twice. Suppress new // dereferences since the OLD behavior is still what is actually used. - this->SuppressWatches = true; + this->SuppressSideEffects = true; newError = ExpandVariablesInStringNew( newErrorstr, newResult, escapeQuotes, noEscapes, atOnly, filename, line, removeEmpty, replaceAt); - this->SuppressWatches = false; + this->SuppressSideEffects = false; CM_FALLTHROUGH; } case cmPolicies::OLD: diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h index b30f281..d8176d9 100644 --- a/Source/cmMakefile.h +++ b/Source/cmMakefile.h @@ -1025,7 +1025,7 @@ private: bool CheckCMP0000; std::set<std::string> WarnedCMP0074; bool IsSourceFileTryCompile; - mutable bool SuppressWatches; + mutable bool SuppressSideEffects; }; #endif |