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

Eclipse: Port API to cmLocalGenerator.

This commit is contained in:
Stephen Kelly 2015-10-07 00:58:45 +02:00
parent f2a641d68b
commit 72efa15dc2
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Source/cmExtraEclipseCDT4Generator.cxx
View File

@ -196,8 +196,11 @@ void cmExtraEclipseCDT4Generator::CreateSourceProjectFile()
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void cmExtraEclipseCDT4Generator::AddEnvVar(cmGeneratedFileStream& fout, void cmExtraEclipseCDT4Generator::AddEnvVar(cmGeneratedFileStream& fout,
const char* envVar, cmMakefile* mf) const char* envVar,
cmLocalGenerator* lg)
{ {
cmMakefile* mf = lg->GetMakefile();
// get the variables from the environment and from the cache and then // get the variables from the environment and from the cache and then
// figure out which one to use: // figure out which one to use:
@ -360,17 +363,17 @@ void cmExtraEclipseCDT4Generator::CreateProjectFile()
// but not necessarily when eclipse is open // but not necessarily when eclipse is open
if (compilerId == "MSVC") if (compilerId == "MSVC")
{ {
AddEnvVar(fout, "PATH", mf); AddEnvVar(fout, "PATH", lg);
AddEnvVar(fout, "INCLUDE", mf); AddEnvVar(fout, "INCLUDE", lg);
AddEnvVar(fout, "LIB", mf); AddEnvVar(fout, "LIB", lg);
AddEnvVar(fout, "LIBPATH", mf); AddEnvVar(fout, "LIBPATH", lg);
} }
else if (compilerId == "Intel") else if (compilerId == "Intel")
{ {
// if the env.var is set, use this one and put it in the cache // if the env.var is set, use this one and put it in the cache
// if the env.var is not set, but the value is in the cache, // if the env.var is not set, but the value is in the cache,
// use it from the cache: // use it from the cache:
AddEnvVar(fout, "INTEL_LICENSE_FILE", mf); AddEnvVar(fout, "INTEL_LICENSE_FILE", lg);
} }
fout << fout <<
"</value>\n" "</value>\n"

2
Source/cmExtraEclipseCDT4Generator.h
View File

@ -100,7 +100,7 @@ private:
std::set<std::string>& emittedDirs); std::set<std::string>& emittedDirs);
static void AddEnvVar(cmGeneratedFileStream& fout, const char* envVar, static void AddEnvVar(cmGeneratedFileStream& fout, const char* envVar,
cmMakefile* mf); cmLocalGenerator* lg);
void CreateLinksToSubprojects(cmGeneratedFileStream& fout, void CreateLinksToSubprojects(cmGeneratedFileStream& fout,
const std::string& baseDir); const std::string& baseDir);