diff options
| author | James Johnston <johnstonj.public@codenest.com> | 2015-08-05 21:23:07 (GMT) |
|---|---|---|
| committer | James Johnston <johnstonj.public@codenest.com> | 2015-08-06 17:32:43 (GMT) |
| commit | afeb4eb243e01df5c7396dc346f2629b21115e2c (patch) | |
| tree | 0ed8f16b6ebc6d9ad28e3fc2397821cb4c6afb7c /Source/cmGlobalGenerator.h | |
| parent | 22590805bffe74c3b4998152556561a2c2b6d177 (diff) | |
| download | CMake-afeb4eb243e01df5c7396dc346f2629b21115e2c.zip CMake-afeb4eb243e01df5c7396dc346f2629b21115e2c.tar.gz CMake-afeb4eb243e01df5c7396dc346f2629b21115e2c.tar.bz2 | |
nmake/jom: Only warn about bad VS environment if compiler not found.
nmake and jom generators no longer warn about missing INCLUDE/LIB
environment variables unless the C/CXX compiler cannot be found. This
is useful if the user does not want to use these generators with the
Visual C++ compiler, or they do not want to enable any language.
Diffstat (limited to 'Source/cmGlobalGenerator.h')
| -rw-r--r-- | Source/cmGlobalGenerator.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h index 3402fbc..ec916ae 100644 --- a/Source/cmGlobalGenerator.h +++ b/Source/cmGlobalGenerator.h @@ -374,6 +374,8 @@ protected: void SetLanguageEnabledFlag(const std::string& l, cmMakefile* mf); void SetLanguageEnabledMaps(const std::string& l, cmMakefile* mf); void FillExtensionToLanguageMap(const std::string& l, cmMakefile* mf); + virtual void PrintCompilerAdvice(std::ostream& os, std::string const& lang, + const char* envVar) const; virtual bool ComputeTargetDepends(); @@ -462,8 +464,6 @@ private: virtual void ForceLinkerLanguages(); - virtual void PrintCompilerAdvice(std::ostream& os, std::string const& lang, - const char* envVar) const; void CheckCompilerIdCompatibility(cmMakefile* mf, std::string const& lang) const; |