kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

support for dll

This commit is contained in:
Ken Martin 2002-08-21 12:02:32 -04:00
parent 6158aa7fd6
commit 96f8d18f8d
2 changed files with 14 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/MFCDialog/CMakeLists.txt
View File

@ -14,4 +14,5 @@ ADD_DEFINITIONS(-D_AFXDLL)
SET(CMAKE_MFC_FLAG 6) SET(CMAKE_MFC_FLAG 6)
ADD_EXECUTABLE(CMakeSetup WIN32 ${SRCS}) ADD_EXECUTABLE(CMakeSetup WIN32 ${SRCS})
TARGET_LINK_LIBRARIES(CMakeSetup CMakeLib)
ADD_DEPENDENCIES(CMakeSetup cmake) ADD_DEPENDENCIES(CMakeSetup cmake)

36
Source/MFCDialog/CMakeSetupDialog.cpp
View File

@ -683,14 +683,11 @@ void CMakeSetupDialog::FillCacheGUIFromCacheManager()
CPropertyItem* item = *i; CPropertyItem* item = *i;
item->m_NewValue = false; item->m_NewValue = false;
} }
const cmCacheManager::CacheEntryMap &cache = for(cmCacheManager::CacheIterator i = cmCacheManager::GetInstance()->NewIterator();
cmCacheManager::GetInstance()->GetCacheMap(); !i.IsAtEnd(); i.Next())
for(cmCacheManager::CacheEntryMap::const_iterator i = cache.begin();
i != cache.end(); ++i)
{ {
const char* key = i->first.c_str(); const char* key = i.GetName();
cmCacheManager::CacheEntry value = i->second; cmCacheManager::CacheEntry value = i.GetEntry();
// if value has trailing space or tab, enclose it in single quotes // if value has trailing space or tab, enclose it in single quotes
// to enforce the fact that it has 'invisible' trailing stuff // to enforce the fact that it has 'invisible' trailing stuff
@ -761,7 +758,7 @@ void CMakeSetupDialog::FillCacheGUIFromCacheManager()
} }
} }
m_OKButton.EnableWindow(false); m_OKButton.EnableWindow(false);
if(cache.size() > 0 && !cmSystemTools::GetErrorOccuredFlag()) if(cmCacheManager::GetInstance()->GetSize() > 0 && !cmSystemTools::GetErrorOccuredFlag())
{ {
bool enable = true; bool enable = true;
items = m_CacheEntriesList.GetItems(); items = m_CacheEntriesList.GetItems();
@ -790,7 +787,6 @@ void CMakeSetupDialog::FillCacheGUIFromCacheManager()
// copy from the list box to the cache manager // copy from the list box to the cache manager
void CMakeSetupDialog::FillCacheManagerFromCacheGUI() void CMakeSetupDialog::FillCacheManagerFromCacheGUI()
{ {
cmCacheManager::GetInstance()->GetCacheMap();
std::set<CPropertyItem*> items = m_CacheEntriesList.GetItems(); std::set<CPropertyItem*> items = m_CacheEntriesList.GetItems();
for(std::set<CPropertyItem*>::iterator i = items.begin(); for(std::set<CPropertyItem*>::iterator i = items.begin();
i != items.end(); ++i) i != items.end(); ++i)
@ -1115,14 +1111,11 @@ void CMakeSetupDialog::OnHelpButton()
void CMakeSetupDialog::ShowAdvancedValues() void CMakeSetupDialog::ShowAdvancedValues()
{ {
const cmCacheManager::CacheEntryMap &cache = for(cmCacheManager::CacheIterator i = cmCacheManager::GetInstance()->NewIterator();
cmCacheManager::GetInstance()->GetCacheMap(); !i.IsAtEnd(); i.Next())
for(cmCacheManager::CacheEntryMap::const_iterator i = cache.begin();
i != cache.end(); ++i)
{ {
const char* key = i->first.c_str(); const char* key = i.GetName();
const cmCacheManager::CacheEntry& value = i->second; const cmCacheManager::CacheEntry& value = i.GetEntry();
if(!cmCacheManager::GetInstance()->IsAdvanced(key)) if(!cmCacheManager::GetInstance()->IsAdvanced(key))
{ {
continue; continue;
@ -1182,14 +1175,11 @@ void CMakeSetupDialog::ShowAdvancedValues()
void CMakeSetupDialog::RemoveAdvancedValues() void CMakeSetupDialog::RemoveAdvancedValues()
{ {
const cmCacheManager::CacheEntryMap &cache = for(cmCacheManager::CacheIterator i = cmCacheManager::GetInstance()->NewIterator();
cmCacheManager::GetInstance()->GetCacheMap(); !i.IsAtEnd(); i.Next())
for(cmCacheManager::CacheEntryMap::const_iterator i = cache.begin();
i != cache.end(); ++i)
{ {
const char* key = i->first.c_str(); const char* key = i.GetName();
const cmCacheManager::CacheEntry& value = i->second; const cmCacheManager::CacheEntry& value = i.GetEntry();
if(cmCacheManager::GetInstance()->IsAdvanced(key)) if(cmCacheManager::GetInstance()->IsAdvanced(key))
{ {
m_CacheEntriesList.RemoveProperty(key); m_CacheEntriesList.RemoveProperty(key);