summaryrefslogtreecommitdiffstats
path: root/Source/cmLoadCacheCommand.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-10-20 12:51:04 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2016-10-20 12:51:04 (GMT)
commit92c3cab223845ca83533bba7b6d73f6180223935 (patch)
tree5a0897241d918b784598637e1efc0ba23dea3bda /Source/cmLoadCacheCommand.cxx
parente10439121e9602f77f80531dd60acc781fba5e79 (diff)
parente6eecec761afd9c1b275d4adebfd08c2e96412fd (diff)
downloadCMake-92c3cab223845ca83533bba7b6d73f6180223935.zip
CMake-92c3cab223845ca83533bba7b6d73f6180223935.tar.gz
CMake-92c3cab223845ca83533bba7b6d73f6180223935.tar.bz2
Merge topic 'split-cmState'
e6eecec7 cmListFileCache: Remove cmState header include e3587ee0 cmTargetPropertyComputer: Add missing include e0a84904 cmState: Split auxiliary classes into separate files a91eaf38 cmState: Port dependents to new cmStateTypes header 27be1d81 cmState: Move extracted declarations to a separate file 34433c88 cmState: Remove compatibility typedefs cde6eb62 cmState: Port dependent code to new cmStateSnapshot name a9bf981a cmState: Move Snapshot type to separate namespace 17d27893 cmState: Port dependent code to new cmStateDirectory name 34bcec39 cmState: Move Directory class to separate namespace 2fe3e55d cmState: Move CacheEntryType enum to separate namespace a49751fb cmState: Move TargetType enum to separate namespace 0060391d cmState: Move SnapshotType enum to separate namespace 5bc964ed cmState: Move PositionType to separate namespace 2dc40996 cmState: Move PolicyStackEntry to separate namespace cb40af5d cmState: Move SnapshotDataType to separate namespace ...
Diffstat (limited to 'Source/cmLoadCacheCommand.cxx')
-rw-r--r--Source/cmLoadCacheCommand.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmLoadCacheCommand.cxx b/Source/cmLoadCacheCommand.cxx
index 3428a6c..49db5b0 100644
--- a/Source/cmLoadCacheCommand.cxx
+++ b/Source/cmLoadCacheCommand.cxx
@@ -140,7 +140,7 @@ void cmLoadCacheCommand::CheckLine(const char* line)
// Check one line of the cache file.
std::string var;
std::string value;
- cmState::CacheEntryType type = cmState::UNINITIALIZED;
+ cmStateEnums::CacheEntryType type = cmStateEnums::UNINITIALIZED;
if (cmake::ParseCacheEntry(line, var, value, type)) {
// Found a real entry. See if this one was requested.
if (this->VariablesToRead.find(var) != this->VariablesToRead.end()) {