Просмотр исходного кода

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

Bill Hoffman 24 лет назад
Родитель
Сommit
e3f0d096c4
1 измененных файлов с 4 добавлено и 2 удалено
  1. 4 2
      Source/cmUnixMakefileGenerator.cxx

+ 4 - 2
Source/cmUnixMakefileGenerator.cxx

@@ -525,7 +525,6 @@ void cmUnixMakefileGenerator::OutputDependencies(std::ostream& fout)
   fout << "CMAKE_DEPEND_LIBS = ";
   cmTarget::LinkLibraries& libs = m_Makefile->GetLinkLibraries();
   cmTarget::LinkLibraries::const_iterator lib2;
-
   // Search the list of libraries that will be linked into
   // the executable
   emitted.clear();
@@ -575,7 +574,10 @@ void cmUnixMakefileGenerator::OutputDependencies(std::ostream& fout)
 
     const char* cacheValue
       = 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";
       library += lib2->first;