diff options
| author | Brad King <brad.king@kitware.com> | 2020-05-01 12:29:37 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-05-01 12:31:32 (GMT) |
| commit | 0b08c1279cbc65b6622894b5ca3b55c61c12cb0c (patch) | |
| tree | 7d1839d8915ad044d3700b14c46ba8a2b53f248a /Source/cmGlobalGenerator.cxx | |
| parent | 255c95163a3fed079167400aa5e978e403ca72fb (diff) | |
| parent | e267c3fddf68dc27a0e756a5d7f5dc618bf3f7eb (diff) | |
| download | CMake-0b08c1279cbc65b6622894b5ca3b55c61c12cb0c.zip CMake-0b08c1279cbc65b6622894b5ca3b55c61c12cb0c.tar.gz CMake-0b08c1279cbc65b6622894b5ca3b55c61c12cb0c.tar.bz2 | |
Merge topic 'cmprop-state'
e267c3fddf cmState::GetInitializedCacheValue: return cmProp
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4696
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 5d42b55..de6a649 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 |