summaryrefslogtreecommitdiffstats
path: root/Source/cmMakefile.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2006-01-13 23:18:32 (GMT)
committerBrad King <brad.king@kitware.com>2006-01-13 23:18:32 (GMT)
commit22c62c9e65817e25b077f88222c682efa0188ccb (patch)
tree077abb80fc469c06f08cc4509ff72bcbee8384c7 /Source/cmMakefile.cxx
parent262295615925c082ec3f98c3fc1f6c259d09ee6f (diff)
downloadCMake-22c62c9e65817e25b077f88222c682efa0188ccb.zip
CMake-22c62c9e65817e25b077f88222c682efa0188ccb.tar.gz
CMake-22c62c9e65817e25b077f88222c682efa0188ccb.tar.bz2
BUG: Sweeping changes to cleanup computation of target names. This should
fix many bugs related to target names being computed inconsistently. - Centralized computation of a target's file name to a method in cmTarget. Now that global knowledge is always available the *_CMAKE_PATH cache variables are no longer needed. - Centralized computation of link library command lines and link directory search order. - Moved computation of link directories needed to link CMake targets to be after evaluation of linking dependencies. This also removed alot of duplicate code in which each version had its own bugs. This commit is surrounded by the tags CMake-TargetNameCentralization1-pre and CMake-TargetNameCentralization1-post so make the large set of changes easy to identify.
Diffstat (limited to 'Source/cmMakefile.cxx')
-rw-r--r--Source/cmMakefile.cxx17
1 files changed, 0 insertions, 17 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index dc4c2ea..58dbab1 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -457,7 +457,6 @@ void cmMakefile::ConfigureFinalPass()
{
cmSystemTools::Error("You have requested backwards compatibility with CMake version 1.2 or earlier. This version of CMake only supports backwards compatibility with CMake 1.4 or later. For compatibility with 1.2 or earlier please use CMake 2.0");
}
-
for (cmTargets::iterator l = m_Targets.begin();
l != m_Targets.end(); l++)
{
@@ -1090,14 +1089,6 @@ void cmMakefile::AddLibrary(const char* lname, int shared,
target.SetMakefile(this);
this->AddGlobalLinkInformation(lname, target);
m_Targets.insert(cmTargets::value_type(lname,target));
-
- // Add an entry into the cache
- std::string libPath = lname;
- libPath += "_CMAKE_PATH";
- this->GetCacheManager()->
- AddCacheEntry(libPath.c_str(),
- this->GetCurrentOutputDirectory(),
- "Path to a library", cmCacheManager::INTERNAL);
}
cmTarget* cmMakefile::AddExecutable(const char *exeName,
@@ -1111,14 +1102,6 @@ cmTarget* cmMakefile::AddExecutable(const char *exeName,
this->AddGlobalLinkInformation(exeName, target);
cmTargets::iterator it =
m_Targets.insert(cmTargets::value_type(exeName,target)).first;
-
- // Add an entry into the cache
- std::string exePath = exeName;
- exePath += "_CMAKE_PATH";
- this->GetCacheManager()->
- AddCacheEntry(exePath.c_str(),
- this->GetCurrentOutputDirectory(),
- "Path to an executable", cmCacheManager::INTERNAL);
return &it->second;
}