diff options
| -rw-r--r-- | Source/cmake.h | 2 | ||||
| -rw-r--r-- | Source/cmakewizard.cxx | 15 | ||||
| -rw-r--r-- | Source/cmakewizard.h | 2 |
3 files changed, 9 insertions, 10 deletions
diff --git a/Source/cmake.h b/Source/cmake.h index 5b69ce7..cc832df 100644 --- a/Source/cmake.h +++ b/Source/cmake.h @@ -19,7 +19,7 @@ #include "cmMakefile.h" #include "cmStandardIncludes.h" -class cmake +class CM_EXPORT cmake { public: diff --git a/Source/cmakewizard.cxx b/Source/cmakewizard.cxx index 8230aed..0b759c4 100644 --- a/Source/cmakewizard.cxx +++ b/Source/cmakewizard.cxx @@ -101,16 +101,15 @@ void cmakewizard::RunWizard(std::vector<std::string> const& args) make.Generate(args); this->ShowMessage("\n"); // load the cache from disk - cmCacheManager::GetInstance()-> + cmCacheManager *cachem = cmCacheManager::GetInstance(); + cachem-> LoadCache(cmSystemTools::GetCurrentWorkingDirectory().c_str()); - cmCacheManager::CacheEntryMap const& currentCache = - cmCacheManager::GetInstance()->GetCacheMap(); + cmCacheManager::CacheIterator i = cachem->NewIterator(); // iterate over all entries in the cache - for(cmCacheManager::CacheEntryMap::const_iterator i = currentCache.begin(); - i != currentCache.end(); ++i) + for(;!i.IsAtEnd(); i.Next()) { - std::string key = i->first; - cmCacheManager::CacheEntry ce = i->second; + std::string key = i.GetName(); + cmCacheManager::CacheEntry ce = i.GetEntry(); if(ce.m_Type == cmCacheManager::INTERNAL || ce.m_Type == cmCacheManager::STATIC) { @@ -136,7 +135,7 @@ void cmakewizard::RunWizard(std::vector<std::string> const& args) asked = true; } } - askedCache[key] = i->second; + askedCache[key] = i.GetEntry(); } cmCacheManager::GetInstance()-> SaveCache(cmSystemTools::GetCurrentWorkingDirectory().c_str()); diff --git a/Source/cmakewizard.h b/Source/cmakewizard.h index 7bc497f..8cdbf13 100644 --- a/Source/cmakewizard.h +++ b/Source/cmakewizard.h @@ -19,7 +19,7 @@ #include "cmMakefile.h" #include "cmStandardIncludes.h" -class cmakewizard +class CM_EXPORT cmakewizard { public: cmakewizard(); |