diff options
| author | Amitha Perera <perera@cs.rpi.edu> | 2002-11-19 23:01:05 (GMT) |
|---|---|---|
| committer | Amitha Perera <perera@cs.rpi.edu> | 2002-11-19 23:01:05 (GMT) |
| commit | 939035ad91aff5de5a1b514176cd2765a1b9a728 (patch) | |
| tree | 9994ce3571301afd9a375bd50eda63603b4de202 /Source/cmMakefile.cxx | |
| parent | 7140c6f364c55084d5e581cc7e603032ec4087b9 (diff) | |
| download | CMake-939035ad91aff5de5a1b514176cd2765a1b9a728.zip CMake-939035ad91aff5de5a1b514176cd2765a1b9a728.tar.gz CMake-939035ad91aff5de5a1b514176cd2765a1b9a728.tar.bz2 | |
BUG: the dependency analysis would incorrectly alphabetically re-order the
link lines, which affects external libraries pulled up from deep within
the dependency tree. Fixed by preserving order everywhere.
Diffstat (limited to 'Source/cmMakefile.cxx')
| -rw-r--r-- | Source/cmMakefile.cxx | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 5e8ec98..d180b84 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -636,15 +636,11 @@ void cmMakefile::AddLibrary(const char* lname, int shared, default: target.SetType(cmTarget::STATIC_LIBRARY); } + // Clear its dependencies. Otherwise, dependencies might persist // over changes in CMakeLists.txt, making the information stale and // hence useless. - std::string depname = lname; - depname += "_LIB_DEPENDS"; - this->GetCacheManager()-> - AddCacheEntry(depname.c_str(), "", - "Dependencies for target", cmCacheManager::STATIC); - + target.ClearDependencyInformation( *this, lname ); target.SetInAll(true); target.GetSourceLists() = srcs; @@ -690,7 +686,6 @@ void cmMakefile::AddLibrary(const char* lname, int shared, "Whether a library is static, shared or module.", cmCacheManager::INTERNAL); } - } void cmMakefile::AddExecutable(const char *exeName, |