mirror of
https://github.com/Kitware/CMake.git
synced 2026-05-03 12:49:50 -05:00
server-mode: Make CMAKE_HOME_DIRECTORY more reliable
Make CMAKE_HOME_DIRECTORY detection work more reliably in the face of symlinks. Closes #16736
This commit is contained in:
@@ -251,6 +251,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,
|
static bool testValue(cmState* state, const std::string& key,
|
||||||
std::string& value, const std::string& keyDescription,
|
std::string& value, const std::string& keyDescription,
|
||||||
std::string* errorMessage)
|
std::string* errorMessage)
|
||||||
@@ -310,8 +331,7 @@ bool cmServerProtocol1_0::DoActivate(const cmServerRequest& request,
|
|||||||
}
|
}
|
||||||
|
|
||||||
// check sourcedir:
|
// check sourcedir:
|
||||||
if (!testValue(state, "CMAKE_HOME_DIRECTORY", sourceDirectory,
|
if (!testHomeDirectory(state, sourceDirectory, errorMessage)) {
|
||||||
"source directory", errorMessage)) {
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user