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.

1 files changed, 0 insertions, 32 deletions

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index d281ddc..6cf4329 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1096,38 +1096,6 @@ void cmMakefile::AddLibrary(const char* lname, int shared,
     AddCacheEntry(libPath.c_str(),
                   this->GetCurrentOutputDirectory(),
                   "Path to a library", cmCacheManager::INTERNAL);
-  
-  // Add an entry into the cache
-  std::string ltname = lname;
-  ltname += "_LIBRARY_TYPE";
-  switch (shared)
-    {
-    case 0:
-      this->GetCacheManager()->AddCacheEntry(ltname.c_str(),"STATIC",
-                                             "Whether a library is static, shared or module.",
-                                             cmCacheManager::INTERNAL);
-      break;
-    case 1:
-      this->GetCacheManager()->
-        AddCacheEntry(ltname.c_str(),
-                      "SHARED",
-                      "Whether a library is static, shared or module.",
-                      cmCacheManager::INTERNAL);
-      break;
-    case 2:
-      this->GetCacheManager()->
-        AddCacheEntry(ltname.c_str(),
-                      "MODULE",
-                      "Whether a library is static, shared or module.",
-                      cmCacheManager::INTERNAL);
-      break;
-    default:
-      this->GetCacheManager()->
-        AddCacheEntry(ltname.c_str(),
-                      "STATIC",
-                      "Whether a library is static, shared or module.",
-                      cmCacheManager::INTERNAL);
-    }
 }
 
 cmTarget* cmMakefile::AddExecutable(const char *exeName,