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

BUG: Need to preserve automatic addition of source tree to -I path if CMAKE_BACKWARDS_COMPATIBILITY is set to below 2.0.

This commit is contained in:
Brad King 2004-06-18 12:56:25 -04:00
parent 97391045bd
commit 06cfe37e22
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Source/cmLocalUnixMakefileGenerator.cxx
View File

@ -2494,6 +2494,23 @@ void cmLocalUnixMakefileGenerator::OutputMakeVariables(std::ostream& fout)
std::vector<std::string>& includes = m_Makefile->GetIncludeDirectories(); std::vector<std::string>& includes = m_Makefile->GetIncludeDirectories();
std::vector<std::string>::iterator i; std::vector<std::string>::iterator i;
std::map<cmStdString, cmStdString> implicitIncludes; std::map<cmStdString, cmStdString> implicitIncludes;
// CMake versions below 2.0 would add the source tree to the -I path
// automatically. Preserve compatibility.
const char* versionValue =
this->GetDefinition("CMAKE_BACKWARDS_COMPATIBILITY");
if(versionValue)
{
int major = 0;
int minor = 0;
if(sscanf(versionValue, "%d.%d", &major, &minor) == 2 && major < 2)
{
fout << "-I"
<< this->ConvertToOutputForExisting(m_Makefile->GetStartDirectory())
<< " ";
}
}
implicitIncludes["/usr/include"] = "/usr/include"; implicitIncludes["/usr/include"] = "/usr/include";
if(m_Makefile->GetDefinition("CMAKE_PLATFORM_IMPLICIT_INCLUDE_DIRECTORIES")) if(m_Makefile->GetDefinition("CMAKE_PLATFORM_IMPLICIT_INCLUDE_DIRECTORIES"))
{ {