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

Merge branch 'user-override-try-compile'

This commit is contained in:
Brad King 2010-07-06 10:18:45 -04:00 committed by CMake Topic Stage
parent f74baa4fcf c8ea2705a7
commit a5d67513a2
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/cmCoreTryCompile.cxx
View File

@ -175,6 +175,23 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv)
{ {
fprintf(fout, "SET(CMAKE_MODULE_PATH %s)\n", def); fprintf(fout, "SET(CMAKE_MODULE_PATH %s)\n", def);
} }
const char* rulesOverrideBase = "CMAKE_USER_MAKE_RULES_OVERRIDE";
std::string rulesOverrideLang =
rulesOverrideBase + (lang ? std::string("_") + lang : std::string(""));
if(const char* rulesOverridePath =
this->Makefile->GetDefinition(rulesOverrideLang.c_str()))
{
fprintf(fout, "SET(%s \"%s\")\n",
rulesOverrideLang.c_str(), rulesOverridePath);
}
else if(const char* rulesOverridePath2 =
this->Makefile->GetDefinition(rulesOverrideBase))
{
fprintf(fout, "SET(%s \"%s\")\n",
rulesOverrideBase, rulesOverridePath2);
}
if(lang) if(lang)
{ {
fprintf(fout, "PROJECT(CMAKE_TRY_COMPILE %s)\n", lang); fprintf(fout, "PROJECT(CMAKE_TRY_COMPILE %s)\n", lang);