mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-02 11:49:55 -06:00
Code Issues Packages Projects Releases Wiki Activity

Server-mode: Rename functions to reflect what they do

Browse Source 
Rename the test* static functions to getOrTest* to better reflect
what they do now.
This commit is contained in:
Tobias Hunger
2018-01-24 16:54:25 +01:00
parent 05e9cdb81e
commit 9b1a3d244b
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Source/cmServerProtocol.cxx
View File

@@ -266,8 +266,8 @@ static void setErrorMessage(std::string* errorMessage, const std::string& text)
}
}
static bool testHomeDirectory(cmState* state, std::string& value,
std::string* errorMessage)
static bool getOrTestHomeDirectory(cmState* state, std::string& value,
std::string* errorMessage)
{
const std::string cachedValue =
std::string(state->GetCacheEntryValue("CMAKE_HOME_DIRECTORY"));
@@ -288,9 +288,10 @@ static bool testHomeDirectory(cmState* state, std::string& value,
return true;
}
static bool testValue(cmState* state, const std::string& key,
std::string& value, const std::string& keyDescription,
std::string* errorMessage)
static bool getOrTestValue(cmState* state, const std::string& key,
std::string& value,
const std::string& keyDescription,
std::string* errorMessage)
{
const char* entry = state->GetCacheEntryValue(key);
const std::string cachedValue =
@@ -337,31 +338,31 @@ bool cmServerProtocol1::DoActivate(const cmServerRequest& request,
cmState* state = cm->GetState();
// Check generator:
if (!testValue(state, "CMAKE_GENERATOR", generator, "generator",
errorMessage)) {
if (!getOrTestValue(state, "CMAKE_GENERATOR", generator, "generator",
errorMessage)) {
return false;
}
// check extra generator:
if (!testValue(state, "CMAKE_EXTRA_GENERATOR", extraGenerator,
"extra generator", errorMessage)) {
if (!getOrTestValue(state, "CMAKE_EXTRA_GENERATOR", extraGenerator,
"extra generator", errorMessage)) {
return false;
}
// check sourcedir:
if (!testHomeDirectory(state, sourceDirectory, errorMessage)) {
if (!getOrTestHomeDirectory(state, sourceDirectory, errorMessage)) {
return false;
}
// check toolset:
if (!testValue(state, "CMAKE_GENERATOR_TOOLSET", toolset, "toolset",
errorMessage)) {
if (!getOrTestValue(state, "CMAKE_GENERATOR_TOOLSET", toolset, "toolset",
errorMessage)) {
return false;
}
// check platform:
if (!testValue(state, "CMAKE_GENERATOR_PLATFORM", platform, "platform",
errorMessage)) {
if (!getOrTestValue(state, "CMAKE_GENERATOR_PLATFORM", platform,
"platform", errorMessage)) {
return false;
}
}