mirror of
https://github.com/Kitware/CMake.git
synced 2026-05-01 03:29:18 -05:00
ENH: big change, only allow commands access to the cache via the cmMakefile class and GetDefinition, also the cmMakefile is the only way for commands to add to the cache. Also, some changes to configure.in that check for for scoping
This commit is contained in:
@@ -82,14 +82,14 @@ void cmMSProjectGenerator::SetLocal(bool local)
|
||||
void cmMSProjectGenerator::ComputeSystemInfo()
|
||||
{
|
||||
// now load the settings
|
||||
if(!cmCacheManager::GetInstance()->GetCacheValue("CMAKE_ROOT"))
|
||||
if(!m_Makefile->GetDefinition("CMAKE_ROOT"))
|
||||
{
|
||||
cmSystemTools::Error(
|
||||
"CMAKE_ROOT has not been defined, bad GUI or driver program");
|
||||
return;
|
||||
}
|
||||
std::string fpath =
|
||||
cmCacheManager::GetInstance()->GetCacheValue("CMAKE_ROOT");
|
||||
m_Makefile->GetDefinition("CMAKE_ROOT");
|
||||
fpath += "/Templates/CMakeWindowsSystemConfig.cmake";
|
||||
m_Makefile->ReadListFile(NULL,fpath.c_str());
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user