diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-04-07 20:45:54 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-04-13 15:44:16 (GMT) |
| commit | f081c5bdddcfcaaf5bee7b918fe5c7ff01faae35 (patch) | |
| tree | a2aad443ecfe835aaa3eaa1d4dd95fc34d94f59f /Source/cmakemain.cxx | |
| parent | f71fdf0ec8289ada5b32b784bc2f6f617538ce0b (diff) | |
| download | CMake-f081c5bdddcfcaaf5bee7b918fe5c7ff01faae35.zip CMake-f081c5bdddcfcaaf5bee7b918fe5c7ff01faae35.tar.gz CMake-f081c5bdddcfcaaf5bee7b918fe5c7ff01faae35.tar.bz2 | |
cmState: Move CacheEntryType enum from cmCacheManager.
Diffstat (limited to 'Source/cmakemain.cxx')
| -rw-r--r-- | Source/cmakemain.cxx | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/Source/cmakemain.cxx b/Source/cmakemain.cxx index f678c6a..c8cf2d4 100644 --- a/Source/cmakemain.cxx +++ b/Source/cmakemain.cxx @@ -19,7 +19,6 @@ #include "cmake.h" #include "cmcmd.h" #include "cmState.h" -#include "cmCacheManager.h" #include "cmListFileCache.h" #include "cmSourceFile.h" #include "cmGlobalGenerator.h" @@ -330,15 +329,13 @@ int do_cmake(int ac, char const* const* av) if ( list_cached || list_all_cached ) { std::cout << "-- Cache values" << std::endl; - std::vector<std::string> keys = - cm.GetState()->GetCacheEntryKeys(); + std::vector<std::string> keys = cm.GetState()->GetCacheEntryKeys(); for (std::vector<std::string>::const_iterator it = keys.begin(); it != keys.end(); ++it) { - cmCacheManager::CacheEntryType t = - cm.GetState()->GetCacheEntryType(*it); - if ( t != cmCacheManager::INTERNAL && t != cmCacheManager::STATIC && - t != cmCacheManager::UNINITIALIZED ) + cmState::CacheEntryType t = cm.GetState()->GetCacheEntryType(*it); + if (t != cmState::INTERNAL && t != cmState::STATIC && + t != cmState::UNINITIALIZED) { const char* advancedProp = cm.GetState()->GetCacheEntryProperty(*it, "ADVANCED"); @@ -351,7 +348,7 @@ int do_cmake(int ac, char const* const* av) "HELPSTRING") << std::endl; } std::cout << *it << ":" << - cmCacheManager::TypeToString(t) + cmState::CacheEntryTypeToString(t) << "=" << cm.GetState()->GetCacheEntryValue(*it) << std::endl; if ( list_help ) |