diff options
| author | Brad King <brad.king@kitware.com> | 2015-04-13 15:45:02 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-04-13 15:45:02 (GMT) |
| commit | 62c5e6f1a19df0043a0e9aaba6cf7247f76a5cc3 (patch) | |
| tree | 8ca950377efbfd2cf90c7fe61eb7ff566a121d5e /Source/cmLoadCacheCommand.cxx | |
| parent | 92d61798937e42ecb7ae3d1be8b2b4ab7ce15fcb (diff) | |
| parent | f081c5bdddcfcaaf5bee7b918fe5c7ff01faae35 (diff) | |
| download | CMake-62c5e6f1a19df0043a0e9aaba6cf7247f76a5cc3.zip CMake-62c5e6f1a19df0043a0e9aaba6cf7247f76a5cc3.tar.gz CMake-62c5e6f1a19df0043a0e9aaba6cf7247f76a5cc3.tar.bz2 | |
Merge topic 'introduce-cmState'
f081c5bd cmState: Move CacheEntryType enum from cmCacheManager.
f71fdf0e cmMakefile: Remove unused CacheManager accessor.
ff7169a0 Port to cmState.
a6b1ad13 Introduce cmState class.
Diffstat (limited to 'Source/cmLoadCacheCommand.cxx')
| -rw-r--r-- | Source/cmLoadCacheCommand.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmLoadCacheCommand.cxx b/Source/cmLoadCacheCommand.cxx index e2ae901..6ade535 100644 --- a/Source/cmLoadCacheCommand.cxx +++ b/Source/cmLoadCacheCommand.cxx @@ -172,7 +172,7 @@ void cmLoadCacheCommand::CheckLine(const char* line) // Check one line of the cache file. std::string var; std::string value; - cmCacheManager::CacheEntryType type = cmCacheManager::UNINITIALIZED; + cmState::CacheEntryType type = cmState::UNINITIALIZED; if(cmake::ParseCacheEntry(line, var, value, type)) { // Found a real entry. See if this one was requested. |