kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUG: fix for bootstrap problem

This commit is contained in:
Ken Martin 2005-07-06 16:16:12 -04:00
parent c4db8aba73
commit ababb68820
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmGlobalUnixMakefileGenerator3.cxx
View File

@ -138,7 +138,7 @@ void cmGlobalUnixMakefileGenerator3::WriteMainMakefile()
depends, depends,
no_commands); no_commands);
lg->WriteMakeVariables(makefileStream); lg->WriteMakeVariables(makefileStream, cmLocalGenerator::HOME_OUTPUT);
lg->WriteSpecialTargetsTop(makefileStream); lg->WriteSpecialTargetsTop(makefileStream);
@ -205,7 +205,7 @@ void cmGlobalUnixMakefileGenerator3::WriteMainMakefile2()
"The main recursive all target", "all", "The main recursive all target", "all",
no_commands, no_commands); no_commands, no_commands);
lg->WriteMakeVariables(makefileStream); lg->WriteMakeVariables(makefileStream,cmLocalGenerator::HOME_OUTPUT);
// write the target convenience rules // write the target convenience rules
unsigned int i; unsigned int i;

16
Source/cmLocalUnixMakefileGenerator3.cxx
View File

@ -353,7 +353,7 @@ cmLocalUnixMakefileGenerator3
} }
this->WriteDisclaimer(ruleFileStream); this->WriteDisclaimer(ruleFileStream);
this->WriteMakeVariables(ruleFileStream); this->WriteMakeVariables(ruleFileStream, HOME_OUTPUT);
// write the custom commands for this target // write the custom commands for this target
std::vector<std::string> cleanFiles; std::vector<std::string> cleanFiles;
@ -791,7 +791,7 @@ cmLocalUnixMakefileGenerator3
return; return;
} }
this->WriteDisclaimer(ruleFileStream); this->WriteDisclaimer(ruleFileStream);
this->WriteMakeVariables(ruleFileStream); this->WriteMakeVariables(ruleFileStream, HOME_OUTPUT);
ruleFileStream ruleFileStream
<< "# Utility rule file for " << target.GetName() << ".\n\n"; << "# Utility rule file for " << target.GetName() << ".\n\n";
@ -955,7 +955,7 @@ void cmLocalUnixMakefileGenerator3::WriteDivider(std::ostream& os)
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void void
cmLocalUnixMakefileGenerator3 cmLocalUnixMakefileGenerator3
::WriteMakeVariables(std::ostream& makefileStream) ::WriteMakeVariables(std::ostream& makefileStream, RelativeRoot root)
{ {
this->WriteDivider(makefileStream); this->WriteDivider(makefileStream);
makefileStream makefileStream
@ -992,13 +992,13 @@ cmLocalUnixMakefileGenerator3
makefileStream makefileStream
<< "# The CMake executable.\n" << "# The CMake executable.\n"
<< "CMAKE_COMMAND = " << "CMAKE_COMMAND = "
<< this->Convert(cmakecommand.c_str(),START_OUTPUT,MAKEFILE).c_str() << this->Convert(cmakecommand.c_str(), root, MAKEFILE).c_str()
<< "\n" << "\n"
<< "\n"; << "\n";
makefileStream makefileStream
<< "# The command to remove a file.\n" << "# The command to remove a file.\n"
<< "RM = " << "RM = "
<< this->Convert(cmakecommand.c_str(),START_OUTPUT,SHELL).c_str() << this->Convert(cmakecommand.c_str(),root,SHELL).c_str()
<< " -E remove -f\n" << " -E remove -f\n"
<< "\n"; << "\n";
@ -1015,13 +1015,13 @@ cmLocalUnixMakefileGenerator3
makefileStream makefileStream
<< "# The top-level source directory on which CMake was run.\n" << "# The top-level source directory on which CMake was run.\n"
<< "CMAKE_SOURCE_DIR = " << "CMAKE_SOURCE_DIR = "
<< this->Convert(m_Makefile->GetHomeDirectory(), START_OUTPUT, SHELL) << this->Convert(m_Makefile->GetHomeDirectory(), root, SHELL)
<< "\n" << "\n"
<< "\n"; << "\n";
makefileStream makefileStream
<< "# The top-level build directory on which CMake was run.\n" << "# The top-level build directory on which CMake was run.\n"
<< "CMAKE_BINARY_DIR = " << "CMAKE_BINARY_DIR = "
<< this->Convert(m_Makefile->GetHomeOutputDirectory(), START_OUTPUT, SHELL) << this->Convert(m_Makefile->GetHomeOutputDirectory(), root, SHELL)
<< "\n" << "\n"
<< "\n"; << "\n";
} }
@ -2780,7 +2780,7 @@ void cmLocalUnixMakefileGenerator3::WriteLocalMakefile()
} }
this->WriteDisclaimer(ruleFileStream); this->WriteDisclaimer(ruleFileStream);
this->WriteMakeVariables(ruleFileStream); this->WriteMakeVariables(ruleFileStream, START_OUTPUT);
this->WriteSpecialTargetsTop(ruleFileStream); this->WriteSpecialTargetsTop(ruleFileStream);

2
Source/cmLocalUnixMakefileGenerator3.h
View File

@ -64,7 +64,7 @@ public:
const std::vector<std::string>& commands); const std::vector<std::string>& commands);
// write the main variables used by the makefiles // write the main variables used by the makefiles
void WriteMakeVariables(std::ostream& makefileStream); void WriteMakeVariables(std::ostream& makefileStream, RelativeRoot root);
// write a comment line #====... in the stream // write a comment line #====... in the stream
void WriteDivider(std::ostream& os); void WriteDivider(std::ostream& os);