diff options
| author | Brad King <brad.king@kitware.com> | 2005-12-14 15:47:33 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2005-12-14 15:47:33 (GMT) |
| commit | 163e3ff56c2d591a902cae018ead930633914b4c (patch) | |
| tree | 6453b0c4f96578718dbe3d715ef2f57ee2e3aa8b /Source/cmLocalGenerator.cxx | |
| parent | af36d6e2e7cc3169517bae944d8b837abdcd4287 (diff) | |
| download | CMake-163e3ff56c2d591a902cae018ead930633914b4c.zip CMake-163e3ff56c2d591a902cae018ead930633914b4c.tar.gz CMake-163e3ff56c2d591a902cae018ead930633914b4c.tar.bz2 | |
ENH: Removed cmMakefile arguments from cmTarget methods because cmTarget has the ivar m_Makefile now. Re-implemented cmLocalUnixMakefileGenerator3::AppendAnyDepend to use the new global knowledge and avoid the need to look at the cache for information about other targets. This should fix problems with custom commands and executables with the OUTPUT_NAME set. Also the <target>_LIBRARY_TYPE cache variable is no longer needed at all and has been removed.
Diffstat (limited to 'Source/cmLocalGenerator.cxx')
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 60ca2ed..29503bc 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -363,7 +363,7 @@ void cmLocalGenerator::GenerateInstallRules() case cmTarget::STATIC_LIBRARY: case cmTarget::MODULE_LIBRARY: fname = libOutPath; - fname += l->second.GetFullName(m_Makefile); + fname += l->second.GetFullName(); files = fname.c_str(); this->AddInstallRule(fout, dest, type, files); break; @@ -371,7 +371,7 @@ void cmLocalGenerator::GenerateInstallRules() { // Special code to handle DLL fname = libOutPath; - fname += l->second.GetFullName(m_Makefile); + fname += l->second.GetFullName(); std::string ext = cmSystemTools::GetFilenameExtension(fname); ext = cmSystemTools::LowerCase(ext); if ( ext == ".dll" ) @@ -428,7 +428,7 @@ void cmLocalGenerator::GenerateInstallRules() if(l->second.GetPropertyAsBool("MACOSX_BUNDLE")) { fname = exeOutPath; - fname += l->second.GetFullName(m_Makefile); + fname += l->second.GetFullName(); std::string plist = fname; plist += ".app/Contents/Info.plist"; fname += ".app/Contents/MacOS/"; @@ -451,7 +451,7 @@ void cmLocalGenerator::GenerateInstallRules() else { fname = exeOutPath; - fname += l->second.GetFullName(m_Makefile); + fname += l->second.GetFullName(); files = fname.c_str(); this->AddInstallRule(fout, dest, type, files, false, properties.c_str()); @@ -668,7 +668,7 @@ void cmLocalGenerator::AddBuildTargetRule(const char* llang, cmTarget& target) std::string createRule = "CMAKE_"; createRule += llang; createRule += target.GetCreateRuleVariable(); - std::string targetName = target.GetFullName(m_Makefile); + std::string targetName = target.GetFullName(); // Executable : // Shared Library: // Static Library: |