summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorKen Martin <ken.martin@kitware.com>2002-08-21 15:59:52 (GMT)
committerKen Martin <ken.martin@kitware.com>2002-08-21 15:59:52 (GMT)
commit15b2d2f2a6f2311cce4d72b042396ba9a7766b56 (patch)
treef00b4725fbe2b8115990ffb58ffb632fc375e1b2 /Source
parenta21140658c5558f39fe258dbde90d895a1d174bd (diff)
downloadCMake-15b2d2f2a6f2311cce4d72b042396ba9a7766b56.zip
CMake-15b2d2f2a6f2311cce4d72b042396ba9a7766b56.tar.gz
CMake-15b2d2f2a6f2311cce4d72b042396ba9a7766b56.tar.bz2
support for plugins
Diffstat (limited to 'Source')
-rw-r--r--Source/cmake.h2
-rw-r--r--Source/cmakewizard.cxx15
-rw-r--r--Source/cmakewizard.h2
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();