瀏覽代碼

removed extra lib paths to avoid finding old libs

Ken Martin 24 年之前
父節點
當前提交
a99f293e3a
共有 1 個文件被更改,包括 8 次插入3 次删除
  1. 8 3
      Source/cmLinkLibrariesCommand.cxx

+ 8 - 3
Source/cmLinkLibrariesCommand.cxx

@@ -70,12 +70,17 @@ bool cmLinkLibrariesCommand::InitialPass(std::vector<std::string> const& args)
       m_Makefile->AddLinkLibrary(i->c_str());  
       }
 
-    const char* dir = m_Makefile->GetDefinition(i->c_str());
-    if( dir )
+    const char* ldir = m_Makefile->GetDefinition("LIBRARY_OUTPUT_PATH");
+    if (cmSystemTools::IsOff(ldir))
       {
-      m_Makefile->AddLinkDirectory( dir );
+      const char* dir = m_Makefile->GetDefinition(i->c_str());
+      if( dir )
+        {
+        m_Makefile->AddLinkDirectory( dir );
+        }
       }
     }
+  
   return true;
 }