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

BUG: fix #8105: don't hardcode "gcc" and "make" but use CMAKE_C_COMPILER and 

CMAKE_MAKE_PROGRAM instead

Alex
This commit is contained in:
Alexander Neundorf 2009-01-09 18:58:21 -05:00
parent fcc97a4f3c
commit c8b2c317e2
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Source/cmExtraEclipseCDT4Generator.cxx
View File

@ -699,7 +699,7 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
"</storageModule>\n" "</storageModule>\n"
; ;
this->AppendStorageScanners(fout); this->AppendStorageScanners(fout, *mf);
fout << "</cconfiguration>\n" fout << "</cconfiguration>\n"
"</storageModule>\n" "</storageModule>\n"
@ -810,8 +810,23 @@ std::string cmExtraEclipseCDT4Generator::EscapeForXML(const std::string& value)
// Helper functions // Helper functions
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void cmExtraEclipseCDT4Generator void cmExtraEclipseCDT4Generator
::AppendStorageScanners(cmGeneratedFileStream& fout) ::AppendStorageScanners(cmGeneratedFileStream& fout,
const cmMakefile& makefile)
{ {
// we need the "make" and the C (or C++) compiler which are used, Alex
std::string make = makefile.GetRequiredDefinition("CMAKE_MAKE_PROGRAM");
std::string compiler = makefile.GetSafeDefinition("CMAKE_C_COMPILER");
if (compiler.empty())
{
compiler = makefile.GetSafeDefinition("CMAKE_CXX_COMPILER");
}
if (compiler.empty()) //Hmm, what to do now ?
{
compiler = "gcc";
}
// the following right now hardcodes gcc behaviour :-/
fout << fout <<
"<storageModule moduleId=\"scannerConfiguration\">\n" "<storageModule moduleId=\"scannerConfiguration\">\n"
"<autodiscovery enabled=\"true\" problemReportingEnabled=\"true\"" "<autodiscovery enabled=\"true\" problemReportingEnabled=\"true\""
@ -822,12 +837,12 @@ void cmExtraEclipseCDT4Generator
"org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile", "org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile",
true, "", true, "specsFile", true, "", true, "specsFile",
"-E -P -v -dD ${plugin_state_location}/${specs_file}", "-E -P -v -dD ${plugin_state_location}/${specs_file}",
"gcc", true, true); compiler, true, true);
cmExtraEclipseCDT4Generator::AppendScannerProfile(fout, cmExtraEclipseCDT4Generator::AppendScannerProfile(fout,
"org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile", "org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile",
true, "", true, "makefileGenerator", true, "", true, "makefileGenerator",
"-f ${project_name}_scd.mk", "-f ${project_name}_scd.mk",
"make", true, true); make, true, true);
fout << "</storageModule>\n"; fout << "</storageModule>\n";
} }

3
Source/cmExtraEclipseCDT4Generator.h
View File

@ -87,7 +87,8 @@ private:
static std::string EscapeForXML(const std::string& value); static std::string EscapeForXML(const std::string& value);
// Helper functions // Helper functions
static void AppendStorageScanners(cmGeneratedFileStream& fout); static void AppendStorageScanners(cmGeneratedFileStream& fout,
const cmMakefile& makefile);
static void AppendTarget (cmGeneratedFileStream& fout, static void AppendTarget (cmGeneratedFileStream& fout,
const std::string& target, const std::string& target,
const std::string& make); const std::string& make);