better try compile
This commit is contained in:
parent
fd49f17297
commit
c1da4c9570
|
@ -627,8 +627,14 @@ void cmake::SetGlobalGenerator(cmGlobalGenerator *gg)
|
|||
|
||||
int cmake::Configure(const char *arg0, const std::vector<std::string>* args)
|
||||
{
|
||||
// Read in the cache
|
||||
// Read in the cache, but not for a try compile
|
||||
// because there will be no cache
|
||||
if (!m_InTryCompile)
|
||||
{
|
||||
m_CacheManager->LoadCache(this->GetHomeOutputDirectory());
|
||||
}
|
||||
|
||||
// do a sanity check on some values
|
||||
if(m_CacheManager->GetCacheValue("CMAKE_HOME_DIRECTORY"))
|
||||
{
|
||||
std::string cacheStart =
|
||||
|
@ -715,8 +721,13 @@ int cmake::Configure(const char *arg0, const std::vector<std::string>* args)
|
|||
cmCacheManager::INTERNAL);
|
||||
}
|
||||
|
||||
// reset any system configuration information
|
||||
// reset any system configuration information, except for when we are
|
||||
// InTryCompile. With TryCompile the system info is taken from the parent's
|
||||
// info to save time
|
||||
if (!m_InTryCompile)
|
||||
{
|
||||
m_GlobalGenerator->ClearEnabledLanguages();
|
||||
}
|
||||
|
||||
// actually do the configure
|
||||
m_GlobalGenerator->Configure();
|
||||
|
|
Loading…
Reference in New Issue