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

FIX: fix bad depend info and COMPILE_FLAGS problem and remove extra cerr calls

This commit is contained in:
Bill Hoffman 2005-08-02 11:06:16 -04:00
parent 8d62804b3a
commit 3b0632ae75
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/cmGlobalUnixMakefileGenerator3.cxx
View File

@ -349,10 +349,16 @@ void cmGlobalUnixMakefileGenerator3
for (cmTargets::iterator l = lg->GetMakefile()->GetTargets().begin(); for (cmTargets::iterator l = lg->GetMakefile()->GetTargets().begin();
l != lg->GetMakefile()->GetTargets().end(); l++) l != lg->GetMakefile()->GetTargets().end(); l++)
{ {
std::string tname = lg->GetRelativeTargetDirectory(l->second); if((l->second.GetType() == cmTarget::EXECUTABLE) ||
tname += "/DependInfo.cmake"; (l->second.GetType() == cmTarget::STATIC_LIBRARY) ||
cmSystemTools::ConvertToUnixSlashes(tname); (l->second.GetType() == cmTarget::SHARED_LIBRARY) ||
cmakefileStream << " \"" << tname.c_str() << "\"\n"; (l->second.GetType() == cmTarget::MODULE_LIBRARY) )
{
std::string tname = lg->GetRelativeTargetDirectory(l->second);
tname += "/DependInfo.cmake";
cmSystemTools::ConvertToUnixSlashes(tname);
cmakefileStream << " \"" << tname.c_str() << "\"\n";
}
} }
} }
cmakefileStream << " )\n"; cmakefileStream << " )\n";

4
Source/cmLocalUnixMakefileGenerator3.cxx
View File

@ -521,7 +521,7 @@ cmLocalUnixMakefileGenerator3
(target.GetType() == cmTarget::MODULE_LIBRARY)); (target.GetType() == cmTarget::MODULE_LIBRARY));
if(shared) if(shared)
{ {
flags += "-D"; flags += " -D";
if(const char* custom_export_name = target.GetProperty("DEFINE_SYMBOL")) if(const char* custom_export_name = target.GetProperty("DEFINE_SYMBOL"))
{ {
flags += custom_export_name; flags += custom_export_name;
@ -543,8 +543,6 @@ cmLocalUnixMakefileGenerator3
// Add include directory flags. // Add include directory flags.
this->AppendFlags(flags, this->GetIncludeFlags(lang)); this->AppendFlags(flags, this->GetIncludeFlags(lang));
std::cerr << "Have total flags: " << flags << std::endl;
// Get the output paths for source and object files. // Get the output paths for source and object files.
std::string sourceFile = source.GetFullPath(); std::string sourceFile = source.GetFullPath();
if(m_UseRelativePaths) if(m_UseRelativePaths)