kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUG: fix so it does not jump into the current directory for inital target builds

Browse Source
This commit is contained in:
Bill Hoffman 2001-06-13 17:50:09 -04:00
parent 78ee6660a7
commit e3f0d096c4
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmUnixMakefileGenerator.cxx
View File

@ -525,7 +525,6 @@ void cmUnixMakefileGenerator::OutputDependencies(std::ostream& fout)
fout << "CMAKE_DEPEND_LIBS = "; fout << "CMAKE_DEPEND_LIBS = ";
cmTarget::LinkLibraries& libs = m_Makefile->GetLinkLibraries(); cmTarget::LinkLibraries& libs = m_Makefile->GetLinkLibraries();
cmTarget::LinkLibraries::const_iterator lib2; cmTarget::LinkLibraries::const_iterator lib2;
// Search the list of libraries that will be linked into // Search the list of libraries that will be linked into
// the executable // the executable
emitted.clear(); emitted.clear();
@ -575,7 +574,10 @@ void cmUnixMakefileGenerator::OutputDependencies(std::ostream& fout)
const char* cacheValue const char* cacheValue
= cmCacheManager::GetInstance()->GetCacheValue(lib2->first.c_str()); = cmCacheManager::GetInstance()->GetCacheValue(lib2->first.c_str());
if(cacheValue) // if cache and not the current directory add a rule, to
// jump into the directory and build for the first time
if(cacheValue
&& (strcmp(m_Makefile->GetCurrentOutputDirectory(), cacheValue) != 0))
{ {
std::string library = "lib"; std::string library = "lib";
library += lib2->first; library += lib2->first;