diff options
author | Alexander Neundorf <neundorf@kde.org> | 2009-12-23 18:56:01 (GMT) |
---|---|---|
committer | Alexander Neundorf <neundorf@kde.org> | 2009-12-23 18:56:01 (GMT) |
commit | c1beb3b141e470e95d46ba58f22f005544d984dc (patch) | |
tree | b57d75cceb0d23ecce4d93d0e812e2cceca3cf40 /Source/cmExtraEclipseCDT4Generator.h | |
parent | a1614caf37e907183fe831b6b7ecb96cdb21bfbe (diff) | |
download | CMake-c1beb3b141e470e95d46ba58f22f005544d984dc.zip CMake-c1beb3b141e470e95d46ba58f22f005544d984dc.tar.gz CMake-c1beb3b141e470e95d46ba58f22f005544d984dc.tar.bz2 |
fix the way the PATH and other related env.vars are stored in the eclipse project file when using MSVC
Before this commit, the value of PATH at cmake time was put into the eclipse
project file. The problem with this is that this will be lost the first time
cmake is rerun from an build inside eclipse which was started without the
environment externally already set.
This patch now:
-adds the env.var to the cache if it is not already in the cache
-reuses the variable from the cache if it is in the cache, but not in the env.
-uses the variable from the cache if it contains the whole content of the
current env.var (e.g. if it is the full PATH plus the MSVC dirs)
Also store INTEL_LICENSE_FILE in the project file if an Intel compiler is used.
Alex
Diffstat (limited to 'Source/cmExtraEclipseCDT4Generator.h')
-rw-r--r-- | Source/cmExtraEclipseCDT4Generator.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/cmExtraEclipseCDT4Generator.h b/Source/cmExtraEclipseCDT4Generator.h index f7ddad9..143b7fa 100644 --- a/Source/cmExtraEclipseCDT4Generator.h +++ b/Source/cmExtraEclipseCDT4Generator.h @@ -100,6 +100,9 @@ private: const std::vector<std::string>& includeDirs, std::set<std::string>& emittedDirs); + static void AddEnvVar(cmGeneratedFileStream& fout, const char* envVar, + cmMakefile* mf); + std::vector<std::string> SrcLinkedResources; std::vector<std::string> OutLinkedResources; std::string HomeDirectory; |