diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2005-08-02 15:06:16 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2005-08-02 15:06:16 (GMT) |
| commit | 3b0632ae75c18be4ef2457b5016d794a65e9e48d (patch) | |
| tree | 91435f62a5d1317294d15caaa3e63347278edc51 | |
| parent | 8d62804b3aac75f4d79a839ad6ded9a020f8a65e (diff) | |
| download | CMake-3b0632ae75c18be4ef2457b5016d794a65e9e48d.zip CMake-3b0632ae75c18be4ef2457b5016d794a65e9e48d.tar.gz CMake-3b0632ae75c18be4ef2457b5016d794a65e9e48d.tar.bz2 | |
FIX: fix bad depend info and COMPILE_FLAGS problem and remove extra cerr calls
| -rw-r--r-- | Source/cmGlobalUnixMakefileGenerator3.cxx | 14 | ||||
| -rw-r--r-- | Source/cmLocalUnixMakefileGenerator3.cxx | 4 |
2 files changed, 11 insertions, 7 deletions
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx index 6684be1..596ce97 100644 --- a/Source/cmGlobalUnixMakefileGenerator3.cxx +++ b/Source/cmGlobalUnixMakefileGenerator3.cxx @@ -349,10 +349,16 @@ void cmGlobalUnixMakefileGenerator3 for (cmTargets::iterator l = lg->GetMakefile()->GetTargets().begin(); l != lg->GetMakefile()->GetTargets().end(); l++) { - std::string tname = lg->GetRelativeTargetDirectory(l->second); - tname += "/DependInfo.cmake"; - cmSystemTools::ConvertToUnixSlashes(tname); - cmakefileStream << " \"" << tname.c_str() << "\"\n"; + if((l->second.GetType() == cmTarget::EXECUTABLE) || + (l->second.GetType() == cmTarget::STATIC_LIBRARY) || + (l->second.GetType() == cmTarget::SHARED_LIBRARY) || + (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"; diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx index e952d3b..e96ed9b 100644 --- a/Source/cmLocalUnixMakefileGenerator3.cxx +++ b/Source/cmLocalUnixMakefileGenerator3.cxx @@ -521,7 +521,7 @@ cmLocalUnixMakefileGenerator3 (target.GetType() == cmTarget::MODULE_LIBRARY)); if(shared) { - flags += "-D"; + flags += " -D"; if(const char* custom_export_name = target.GetProperty("DEFINE_SYMBOL")) { flags += custom_export_name; @@ -543,8 +543,6 @@ cmLocalUnixMakefileGenerator3 // Add include directory flags. this->AppendFlags(flags, this->GetIncludeFlags(lang)); - std::cerr << "Have total flags: " << flags << std::endl; - // Get the output paths for source and object files. std::string sourceFile = source.GetFullPath(); if(m_UseRelativePaths) |