diff options
| author | Vitaly Stakhovsky <vvs31415@gitlab.org> | 2020-05-01 02:00:00 (GMT) |
|---|---|---|
| committer | Vitaly Stakhovsky <vvs31415@gitlab.org> | 2020-04-30 14:45:45 (GMT) |
| commit | e267c3fddf68dc27a0e756a5d7f5dc618bf3f7eb (patch) | |
| tree | 51253a7d8399e05e48a618aeafd805a985cbb411 /Source/cmGlobalGenerator.cxx | |
| parent | c09efe074d793203ab846e97bde8d03e4714dc2a (diff) | |
| download | CMake-e267c3fddf68dc27a0e756a5d7f5dc618bf3f7eb.zip CMake-e267c3fddf68dc27a0e756a5d7f5dc618bf3f7eb.tar.gz CMake-e267c3fddf68dc27a0e756a5d7f5dc618bf3f7eb.tar.bz2 | |
cmState::GetInitializedCacheValue: return cmProp
cmProp alias is used; no actual change in type
Diffstat (limited to 'Source/cmGlobalGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index 2664fb0..53aa9f3 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -232,7 +232,7 @@ void cmGlobalGenerator::ResolveLanguageCompiler(const std::string& lang, if (!optional && (path.empty() || !cmSystemTools::FileExists(path))) { return; } - const std::string* cname = + cmProp cname = this->GetCMakeInstance()->GetState()->GetInitializedCacheValue(langComp); std::string changeVars; if (cname && !optional) { @@ -2057,9 +2057,8 @@ void cmGlobalGenerator::AddMakefile(std::unique_ptr<cmMakefile> mf) // update progress // estimate how many lg there will be - const std::string* numGenC = - this->CMakeInstance->GetState()->GetInitializedCacheValue( - "CMAKE_NUMBER_OF_MAKEFILES"); + cmProp numGenC = this->CMakeInstance->GetState()->GetInitializedCacheValue( + "CMAKE_NUMBER_OF_MAKEFILES"); if (!numGenC) { // If CMAKE_NUMBER_OF_MAKEFILES is not set |