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

BUG: fix so you can remove a directory in the source tree, and clean up echo of commands

This commit is contained in:
Bill Hoffman 2001-12-21 15:39:43 -05:00
parent 65339be84a
commit 2c7bb2bf34
2 changed files with 46 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Source/cmNMakeMakefileGenerator.cxx
View File

@ -309,28 +309,40 @@ void cmNMakeMakefileGenerator::OutputMakeRule(std::ostream& fout,
{ {
replace = ShortPathCommand(command); replace = ShortPathCommand(command);
m_Makefile->ExpandVariablesInString(replace); m_Makefile->ExpandVariablesInString(replace);
fout << "\t" << "echo " << replace.c_str() << "\n"; if(replace[0] != '-' && replace.find("echo") != 0)
{
fout << "\t" << "echo " << replace.c_str() << "\n";
}
fout << "\t" << replace.c_str() << "\n"; fout << "\t" << replace.c_str() << "\n";
} }
if(command2) if(command2)
{ {
replace = ShortPathCommand(command2); replace = ShortPathCommand(command2);
m_Makefile->ExpandVariablesInString(replace); m_Makefile->ExpandVariablesInString(replace);
fout << "\t" << "echo " << replace.c_str() << "\n"; if(replace[0] != '-' && replace.find("echo") != 0)
{
fout << "\t" << "echo " << replace.c_str() << "\n";
}
fout << "\t" << replace.c_str() << "\n"; fout << "\t" << replace.c_str() << "\n";
} }
if(command3) if(command3)
{ {
replace = ShortPathCommand(command3); replace = ShortPathCommand(command3);
m_Makefile->ExpandVariablesInString(replace); m_Makefile->ExpandVariablesInString(replace);
fout << "\t" << "echo " << replace.c_str() << "\n"; if(replace[0] != '-' && replace.find("echo") != 0)
{
fout << "\t" << "echo " << replace.c_str() << "\n";
}
fout << "\t" << replace.c_str() << "\n"; fout << "\t" << replace.c_str() << "\n";
} }
if(command4) if(command4)
{ {
replace = ShortPathCommand(command4); replace = ShortPathCommand(command4);
m_Makefile->ExpandVariablesInString(replace); m_Makefile->ExpandVariablesInString(replace);
fout << "\t" << "echo " << replace.c_str() << "\n"; if(replace[0] != '-' && replace.find("echo") != 0)
{
fout << "\t" << "echo " << replace.c_str() << "\n";
}
fout << "\t" << replace.c_str() << "\n"; fout << "\t" << replace.c_str() << "\n";
} }
fout << "\n"; fout << "\n";

36
Source/cmUnixMakefileGenerator.cxx
View File

@ -1511,15 +1511,27 @@ void cmUnixMakefileGenerator::OutputMakeRules(std::ostream& fout)
this->BuildInSubDirectory(fout, this->BuildInSubDirectory(fout,
m_Makefile->GetHomeOutputDirectory(), m_Makefile->GetHomeOutputDirectory(),
"depend", 0); "depend", 0);
const char* depend_subdirs = 0;
if(!m_Makefile->GetSubDirectories().empty())
{
this->OutputMakeRule(fout,
"Rule to force build of cmake.depend in subdirectories",
"depend_subdirs",
"$(SUBDIR_DEPEND)",
0
);
depend_subdirs = "$(MAKE) -$(MAKEFLAGS) $(MAKESILENT) depend_subdirs";
}
this->OutputMakeRule(fout, this->OutputMakeRule(fout,
"Rule to force the build of cmake.depends", "Rule to force the build of cmake.depends",
"depend", "depend",
"$(SUBDIR_DEPEND)", 0,
"$(CMAKE_COMMAND) " "$(CMAKE_COMMAND) "
"-S$(CMAKE_CURRENT_SOURCE) -O$(CMAKE_CURRENT_BINARY) " "-S$(CMAKE_CURRENT_SOURCE) -O$(CMAKE_CURRENT_BINARY) "
"-H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)", "-H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)",
"-$(RM) cmake.depends_mark", "-$(RM) cmake.depends_mark",
"echo mark > cmake.depends_mark" "echo mark > cmake.depends_mark",
depend_subdirs
); );
this->OutputMakeRule(fout, this->OutputMakeRule(fout,
"Rebuild CMakeCache.txt file", "Rebuild CMakeCache.txt file",
@ -1739,28 +1751,40 @@ void cmUnixMakefileGenerator::OutputMakeRule(std::ostream& fout,
{ {
replace = command; replace = command;
m_Makefile->ExpandVariablesInString(replace); m_Makefile->ExpandVariablesInString(replace);
fout << "\t" << "echo " << replace.c_str() << "\n"; if(replace[0] != '-' || replace.find("echo") != 0)
{
fout << "\t" << "echo " << replace.c_str() << "\n";
}
fout << "\t" << replace.c_str() << "\n"; fout << "\t" << replace.c_str() << "\n";
} }
if(command2) if(command2)
{ {
replace = command2; replace = command2;
m_Makefile->ExpandVariablesInString(replace); m_Makefile->ExpandVariablesInString(replace);
fout << "\t" << "echo " << replace.c_str() << "\n"; if(replace[0] != '-' && replace.find("echo") != 0)
{
fout << "\t" << "echo " << replace.c_str() << "\n";
}
fout << "\t" << replace.c_str() << "\n"; fout << "\t" << replace.c_str() << "\n";
} }
if(command3) if(command3)
{ {
replace = command3; replace = command3;
m_Makefile->ExpandVariablesInString(replace); m_Makefile->ExpandVariablesInString(replace);
fout << "\t" << "echo " << replace.c_str() << "\n"; if(replace[0] != '-' && replace.find("echo") != 0)
{
fout << "\t" << "echo " << replace.c_str() << "\n";
}
fout << "\t" << replace.c_str() << "\n"; fout << "\t" << replace.c_str() << "\n";
} }
if(command4) if(command4)
{ {
replace = command4; replace = command4;
m_Makefile->ExpandVariablesInString(replace); m_Makefile->ExpandVariablesInString(replace);
fout << "\t" << "echo " << replace.c_str() << "\n"; if(replace[0] != '-' && replace.find("echo") != 0)
{
fout << "\t" << "echo " << replace.c_str() << "\n";
}
fout << "\t" << replace.c_str() << "\n"; fout << "\t" << replace.c_str() << "\n";
} }
fout << "\n"; fout << "\n";