summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalXCodeGenerator.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'Source/cmGlobalXCodeGenerator.cxx')
-rw-r--r--Source/cmGlobalXCodeGenerator.cxx22
1 files changed, 12 insertions, 10 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index b2da216..484ac1e 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -76,23 +76,25 @@ void cmGlobalXCodeGenerator::EnableLanguage(std::vector<std::string>const&
}
//----------------------------------------------------------------------------
-int cmGlobalXCodeGenerator::TryCompile(const char *,
- const char * bindir,
- const char * projectName,
- const char * targetName,
- std::string * output,
- cmMakefile*)
+int cmGlobalXCodeGenerator::Build(
+ const char *,
+ const char *bindir,
+ const char *projectName,
+ const char *targetName,
+ std::string *output,
+ const char *makeCommandCSTR,
+ const char *,
+ bool )
{
// now build the test
- std::string makeCommand =
- m_CMakeInstance->GetCacheManager()->GetCacheValue("CMAKE_MAKE_PROGRAM");
- if(makeCommand.size() == 0)
+ if(makeCommandCSTR == 0 || !strlen(makeCommandCSTR))
{
cmSystemTools::Error(
"Generator cannot find the appropriate make command.");
return 1;
}
- makeCommand = cmSystemTools::ConvertToOutputPath(makeCommand.c_str());
+ std::string makeCommand =
+ cmSystemTools::ConvertToOutputPath(makeCommandCSTR);
std::string lowerCaseCommand = makeCommand;
cmSystemTools::LowerCase(lowerCaseCommand);