summaryrefslogtreecommitdiffstats
path: root/Source/cmSetCommand.cxx
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2016-10-18 19:28:47 (GMT)
committerStephen Kelly <steveire@gmail.com>2016-10-19 13:40:58 (GMT)
commit2fe3e55d53989c909be595b00a4749b75886accf (patch)
tree2e4c856f1f992f20acc39659901a28ef6b7ec98a /Source/cmSetCommand.cxx
parenta49751fb2eed0ca6415b243c35b23201b8060597 (diff)
downloadCMake-2fe3e55d53989c909be595b00a4749b75886accf.zip
CMake-2fe3e55d53989c909be595b00a4749b75886accf.tar.gz
CMake-2fe3e55d53989c909be595b00a4749b75886accf.tar.bz2
cmState: Move CacheEntryType enum to separate namespace
Port dependent code to the change.
Diffstat (limited to 'Source/cmSetCommand.cxx')
-rw-r--r--Source/cmSetCommand.cxx9
1 files changed, 5 insertions, 4 deletions
diff --git a/Source/cmSetCommand.cxx b/Source/cmSetCommand.cxx
index 8ce0b18..65b0e9c 100644
--- a/Source/cmSetCommand.cxx
+++ b/Source/cmSetCommand.cxx
@@ -64,8 +64,9 @@ bool cmSetCommand::InitialPass(std::vector<std::string> const& args,
bool cache = false; // optional
bool force = false; // optional
bool parentScope = false;
- cmState::CacheEntryType type = cmState::STRING; // required if cache
- const char* docstring = CM_NULLPTR; // required if cache
+ cmStateEnums::CacheEntryType type =
+ cmStateEnums::STRING; // required if cache
+ const char* docstring = CM_NULLPTR; // required if cache
unsigned int ignoreLastArgs = 0;
// look for PARENT_SCOPE argument
@@ -115,12 +116,12 @@ bool cmSetCommand::InitialPass(std::vector<std::string> const& args,
cmState* state = this->Makefile->GetState();
const char* existingValue = state->GetCacheEntryValue(variable);
if (existingValue &&
- (state->GetCacheEntryType(variable) != cmState::UNINITIALIZED)) {
+ (state->GetCacheEntryType(variable) != cmStateEnums::UNINITIALIZED)) {
// if the set is trying to CACHE the value but the value
// is already in the cache and the type is not internal
// then leave now without setting any definitions in the cache
// or the makefile
- if (cache && type != cmState::INTERNAL && !force) {
+ if (cache && type != cmStateEnums::INTERNAL && !force) {
return true;
}
}