mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-21 22:50:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'server-mode-fix-home-dir-check'

Browse Source 
8285ad51 server-mode: Make CMAKE_HOME_DIRECTORY more reliable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !611
This commit is contained in:
Brad King
2017-03-23 12:46:25 +00:00
committed by Kitware Robot
parent f673623130 8285ad511a
commit 677b3cbf28
1 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Source/cmServerProtocol.cxx
View File

@@ -255,6 +255,27 @@ static void setErrorMessage(std::string* errorMessage, const std::string& text)
}
}
static bool testHomeDirectory(cmState* state, std::string& value,
std::string* errorMessage)
{
const std::string cachedValue =
std::string(state->GetCacheEntryValue("CMAKE_HOME_DIRECTORY"));
const std::string suffix = "/CMakeLists.txt";
const std::string cachedValueCML = cachedValue + suffix;
const std::string valueCML = value + suffix;
if (!cmSystemTools::SameFile(valueCML, cachedValueCML)) {
setErrorMessage(errorMessage,
std::string("\"CMAKE_HOME_DIRECTORY\" is set but "
"incompatible with configured "
"source directory value."));
return false;
}
if (value.empty()) {
value = cachedValue;
}
return true;
}
static bool testValue(cmState* state, const std::string& key,
std::string& value, const std::string& keyDescription,
std::string* errorMessage)
@@ -314,8 +335,7 @@ bool cmServerProtocol1_0::DoActivate(const cmServerRequest& request,
}
// check sourcedir:
if (!testValue(state, "CMAKE_HOME_DIRECTORY", sourceDirectory,
"source directory", errorMessage)) {
if (!testHomeDirectory(state, sourceDirectory, errorMessage)) {
return false;
}