diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 131c6ff4c..9b28bdb77 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -519,8 +519,3 @@ std::string cmLocalGenerator::ConvertToRelativeOutputPath(const char* p) } -const char* cmLocalGenerator::GetFileLanguage(const char* ext) -{ - // fill a map of languages enabled - return 0; -} diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h index e4de6d2da..792d8e13c 100644 --- a/Source/cmLocalGenerator.h +++ b/Source/cmLocalGenerator.h @@ -91,7 +91,6 @@ public: cmLocalGenerator* GetParent(){return m_Parent;} void SetParent(cmLocalGenerator* g) { m_Parent = g;} - const char* GetFileLanguage(const char*); protected: virtual void AddInstallRule(std::ostream& fout, const char* dest, int type, const char* files, bool optional = false, const char* properties = 0); diff --git a/Source/cmLocalUnixMakefileGenerator.cxx b/Source/cmLocalUnixMakefileGenerator.cxx index c760e98f7..e5092fe2a 100644 --- a/Source/cmLocalUnixMakefileGenerator.cxx +++ b/Source/cmLocalUnixMakefileGenerator.cxx @@ -2887,6 +2887,11 @@ OutputBuildObjectFromSource(std::ostream& fout, { switch(format) { + // these are all handled by the if(lang) step now + case cmSystemTools::C_FILE_FORMAT: + case cmSystemTools::CXX_FILE_FORMAT: + case cmSystemTools::FORTRAN_FILE_FORMAT: + break; case cmSystemTools::HEADER_FILE_FORMAT: return; case cmSystemTools::DEFINITION_FILE_FORMAT: