summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2004-09-03 17:24:10 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2004-09-03 17:24:10 (GMT)
commit46a493ae7458119573b2185fce7084e9001de1f2 (patch)
tree9b648ac841aea2ae6a54d8b4c3f54d54e3c0867b
parentc2ef51e1816fa9b82b1319b5c5c3cbfc3256cea1 (diff)
downloadCMake-46a493ae7458119573b2185fce7084e9001de1f2.zip
CMake-46a493ae7458119573b2185fce7084e9001de1f2.tar.gz
CMake-46a493ae7458119573b2185fce7084e9001de1f2.tar.bz2
ENH: remove warnings
-rw-r--r--Source/cmLocalGenerator.cxx5
-rw-r--r--Source/cmLocalGenerator.h1
-rw-r--r--Source/cmLocalUnixMakefileGenerator.cxx5
3 files changed, 5 insertions, 6 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 131c6ff..9b28bdb 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 e4de6d2..792d8e1 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 c760e98..e5092fe 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: