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

BUG: util targets now show up in locla makefile and make rebuild_cache now works in subdirs

Browse Source
This commit is contained in:
Ken Martin 2005-07-05 09:21:44 -04:00
parent d11707c6e6
commit 12605f16ac
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Source/cmLocalUnixMakefileGenerator3.cxx
View File

@ -992,15 +992,16 @@ cmLocalUnixMakefileGenerator3
makefileStream makefileStream
<< "# The CMake executable.\n" << "# The CMake executable.\n"
<< "CMAKE_COMMAND = " << "CMAKE_COMMAND = "
<< this->Convert(cmakecommand.c_str(),HOME_OUTPUT,MAKEFILE).c_str() << "\n" << this->Convert(cmakecommand.c_str(),START_OUTPUT,MAKEFILE).c_str()
<< "\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(),HOME_OUTPUT,SHELL).c_str() << this->Convert(cmakecommand.c_str(),START_OUTPUT,SHELL).c_str()
<< " -E remove -f\n" << " -E remove -f\n"
<< "\n"; << "\n";
if(m_Makefile->GetDefinition("CMAKE_EDIT_COMMAND")) if(m_Makefile->GetDefinition("CMAKE_EDIT_COMMAND"))
{ {
makefileStream makefileStream
@ -1014,12 +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(), HOME_OUTPUT, SHELL) << this->Convert(m_Makefile->GetHomeDirectory(), START_OUTPUT, 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)
<< "\n" << "\n"
<< "\n"; << "\n";
} }
@ -2800,7 +2802,7 @@ void cmLocalUnixMakefileGenerator3::WriteLocalMakefile()
this->CreateJumpCommand(commands,"Makefile2",dir); this->CreateJumpCommand(commands,"Makefile2",dir);
this->WriteMakeRule(ruleFileStream, "The main clean target", "clean", depends, commands); this->WriteMakeRule(ruleFileStream, "The main clean target", "clean", depends, commands);
// recursively write our targets, and while doing it collect up the object // write our targets, and while doing it collect up the object
// file rules // file rules
this->WriteLocalMakefileTargets(ruleFileStream); this->WriteLocalMakefileTargets(ruleFileStream);
@ -2845,7 +2847,8 @@ void cmLocalUnixMakefileGenerator3
if((t->second.GetType() == cmTarget::EXECUTABLE) || if((t->second.GetType() == cmTarget::EXECUTABLE) ||
(t->second.GetType() == cmTarget::STATIC_LIBRARY) || (t->second.GetType() == cmTarget::STATIC_LIBRARY) ||
(t->second.GetType() == cmTarget::SHARED_LIBRARY) || (t->second.GetType() == cmTarget::SHARED_LIBRARY) ||
(t->second.GetType() == cmTarget::MODULE_LIBRARY)) (t->second.GetType() == cmTarget::MODULE_LIBRARY) ||
(t->second.GetType() == cmTarget::UTILITY))
{ {
// Add a rule to build the target by name. // Add a rule to build the target by name.
localName = this->GetRelativeTargetDirectory(t->second); localName = this->GetRelativeTargetDirectory(t->second);