diff options
| author | Vitaly Stakhovsky <vvs31415@gitlab.org> | 2020-04-30 22:00:00 -0400 |
|---|---|---|
| committer | Vitaly Stakhovsky <vvs31415@gitlab.org> | 2020-04-30 10:45:45 -0400 |
| commit | e267c3fddf68dc27a0e756a5d7f5dc618bf3f7eb (patch) | |
| tree | 51253a7d8399e05e48a618aeafd805a985cbb411 /Source/cmServerProtocol.cxx | |
| parent | c09efe074d793203ab846e97bde8d03e4714dc2a (diff) | |
| download | cmake-e267c3fddf68dc27a0e756a5d7f5dc618bf3f7eb.tar.gz | |
cmState::GetInitializedCacheValue: return cmProp
cmProp alias is used; no actual change in type
Diffstat (limited to 'Source/cmServerProtocol.cxx')
| -rw-r--r-- | Source/cmServerProtocol.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/cmServerProtocol.cxx b/Source/cmServerProtocol.cxx index 10e63175c5..f6154eb934 100644 --- a/Source/cmServerProtocol.cxx +++ b/Source/cmServerProtocol.cxx @@ -26,6 +26,8 @@ #include "cmSystemTools.h" #include "cmake.h" +using cmProp = const std::string*; // just to silence IWYU + // Get rid of some windows macros: #undef max @@ -562,7 +564,7 @@ cmServerResponse cmServerProtocol1::ProcessConfigure( if (cm->LoadCache(buildDir)) { // build directory has been set up before - const std::string* cachedSourceDir = + cmProp cachedSourceDir = cm->GetState()->GetInitializedCacheValue("CMAKE_HOME_DIRECTORY"); if (!cachedSourceDir) { return request.ReportError("No CMAKE_HOME_DIRECTORY found in cache."); @@ -572,7 +574,7 @@ cmServerResponse cmServerProtocol1::ProcessConfigure( cm->SetHomeDirectory(sourceDir); } - const std::string* cachedGenerator = + cmProp cachedGenerator = cm->GetState()->GetInitializedCacheValue("CMAKE_GENERATOR"); if (cachedGenerator) { if (gg && gg->GetName() != *cachedGenerator) { |