mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-06 05:40:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

cmState: Move CacheEntryType enum to separate namespace

Browse Source 
Port dependent code to the change.
This commit is contained in:
Stephen Kelly
2016-10-18 21:28:47 +02:00
parent a49751fb2e
commit 2fe3e55d53
50 changed files with 211 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmOptionCommand.cxx
View File

@@ -32,7 +32,7 @@ bool cmOptionCommand::InitialPass(std::vector<std::string> const& args,
cmState* state = this->Makefile->GetState();
const char* existingValue = state->GetCacheEntryValue(args[0]);
if (existingValue) {
if (state->GetCacheEntryType(args[0]) != cmState::UNINITIALIZED) {
if (state->GetCacheEntryType(args[0]) != cmStateEnums::UNINITIALIZED) {
state->SetCacheEntryProperty(args[0], "HELPSTRING", args[1]);
return true;
}
@@ -43,6 +43,6 @@ bool cmOptionCommand::InitialPass(std::vector<std::string> const& args,
}
bool init = cmSystemTools::IsOn(initialValue.c_str());
this->Makefile->AddCacheDefinition(args[0], init ? "ON" : "OFF",
args[1].c_str(), cmState::BOOL);
args[1].c_str(), cmStateEnums::BOOL);
return true;
}