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

BUG: Hack to support building existing trees with UTILITY_SOURCE commands and the new VS generator directory structure.

This commit is contained in:
Brad King 2005-07-27 16:37:44 -04:00
parent de217bee8d
commit 99f3b37f9c
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/cmUtilitySourceCommand.cxx
View File

@ -31,11 +31,15 @@ bool cmUtilitySourceCommand::InitialPass(std::vector<std::string> const& args)
std::string cacheEntry = *arg++; std::string cacheEntry = *arg++;
const char* cacheValue = const char* cacheValue =
m_Makefile->GetDefinition(cacheEntry.c_str()); m_Makefile->GetDefinition(cacheEntry.c_str());
// If it exists already, we are done. // If it exists already and appears up to date then we are done. If
// unless this is Major // the string contains "(IntDir)" but that is not the
if(cacheValue && // CMAKE_CFG_INTDIR setting then the value is out of date.
(m_Makefile->GetCacheMajorVersion() != 0 const char* intDir = m_Makefile->GetRequiredDefinition("CMAKE_CFG_INTDIR");
&& m_Makefile->GetCacheMinorVersion() != 0 )) if(cacheValue &&
(strstr(cacheValue, "(IntDir)") == 0 ||
intDir && strcmp(intDir, "$(IntDir)") == 0) &&
(m_Makefile->GetCacheMajorVersion() != 0 &&
m_Makefile->GetCacheMinorVersion() != 0 ))
{ {
return true; return true;
} }