summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKen Martin <ken.martin@kitware.com>2005-07-27 16:41:08 (GMT)
committerKen Martin <ken.martin@kitware.com>2005-07-27 16:41:08 (GMT)
commit4a98fcd0595b4ea270143bb5aeac7f2c6a4d46f6 (patch)
tree390f9f74598810014b6f37417a30fd87f9686346
parenteccf5e7903aa85fd5f2c4d4a737ca0f4c454569d (diff)
downloadCMake-4a98fcd0595b4ea270143bb5aeac7f2c6a4d46f6.zip
CMake-4a98fcd0595b4ea270143bb5aeac7f2c6a4d46f6.tar.gz
CMake-4a98fcd0595b4ea270143bb5aeac7f2c6a4d46f6.tar.bz2
ENH: fix some warnings and cleanup some
-rw-r--r--Source/cmLocalUnixMakefileGenerator3.cxx6
-rw-r--r--Source/cmLocalUnixMakefileGenerator3.h1
2 files changed, 2 insertions, 5 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index d11c7ca..fde40bc 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -180,7 +180,7 @@ void cmLocalUnixMakefileGenerator3
if(cmCustomCommand* cc = (*i)->GetCustomCommand())
{
cc->Used();
- this->GenerateCustomRuleFile(*cc,tgtDir.c_str(),ruleFileStream);
+ this->GenerateCustomRuleFile(*cc,ruleFileStream);
if (clean)
{
cleanFiles.push_back
@@ -640,7 +640,7 @@ cmLocalUnixMakefileGenerator3
//----------------------------------------------------------------------------
void
cmLocalUnixMakefileGenerator3
-::GenerateCustomRuleFile(const cmCustomCommand& cc, const char *dir,
+::GenerateCustomRuleFile(const cmCustomCommand& cc,
std::ostream &ruleFileStream)
{
// Convert the output name to a relative path if possible.
@@ -1786,8 +1786,6 @@ cmLocalUnixMakefileGenerator3
{
return;
}
- cmGlobalUnixMakefileGenerator3 *gg =
- static_cast<cmGlobalUnixMakefileGenerator3 *>(m_GlobalGenerator);
this->WriteDependLanguageInfo(infoFileStream,target);
// and now write the rule to use it
diff --git a/Source/cmLocalUnixMakefileGenerator3.h b/Source/cmLocalUnixMakefileGenerator3.h
index 8aa979f..b1216a1 100644
--- a/Source/cmLocalUnixMakefileGenerator3.h
+++ b/Source/cmLocalUnixMakefileGenerator3.h
@@ -225,7 +225,6 @@ protected:
void GenerateCustomRuleFile(const cmCustomCommand& cc,
- const char *dir,
std::ostream &ruleStream);
// these three make some simple changes and then call WriteLibraryRule