summaryrefslogtreecommitdiff
path: root/Source/cmSetCommand.cxx
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2015-04-07 22:45:54 +0200
committerBrad King <brad.king@kitware.com>2015-04-13 11:44:16 -0400
commitf081c5bdddcfcaaf5bee7b918fe5c7ff01faae35 (patch)
treea2aad443ecfe835aaa3eaa1d4dd95fc34d94f59f /Source/cmSetCommand.cxx
parentf71fdf0ec8289ada5b32b784bc2f6f617538ce0b (diff)
downloadcmake-f081c5bdddcfcaaf5bee7b918fe5c7ff01faae35.tar.gz
cmState: Move CacheEntryType enum from cmCacheManager.
Diffstat (limited to 'Source/cmSetCommand.cxx')
-rw-r--r--Source/cmSetCommand.cxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/cmSetCommand.cxx b/Source/cmSetCommand.cxx
index c636d530b4..bf9f42c8a5 100644
--- a/Source/cmSetCommand.cxx
+++ b/Source/cmSetCommand.cxx
@@ -79,8 +79,8 @@ bool cmSetCommand
bool cache = false; // optional
bool force = false; // optional
bool parentScope = false;
- cmCacheManager::CacheEntryType type
- = cmCacheManager::STRING; // required if cache
+ cmState::CacheEntryType type
+ = cmState::STRING; // required if cache
const char* docstring = 0; // required if cache
unsigned int ignoreLastArgs = 0;
@@ -131,7 +131,7 @@ bool cmSetCommand
if(cache)
{
std::string::size_type cacheStart = args.size() - 3 - (force ? 1 : 0);
- type = cmCacheManager::StringToType(args[cacheStart+1].c_str());
+ type = cmState::StringToCacheEntryType(args[cacheStart+1].c_str());
docstring = args[cacheStart+2].c_str();
}
@@ -139,13 +139,13 @@ bool cmSetCommand
cmState* state = this->Makefile->GetState();
const char* existingValue = state->GetCacheEntryValue(variable);
if(existingValue &&
- (state->GetCacheEntryType(variable) != cmCacheManager::UNINITIALIZED))
+ (state->GetCacheEntryType(variable) != cmState::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 != cmCacheManager::INTERNAL && !force)
+ if(cache && type != cmState::INTERNAL && !force)
{
return true;
}