Explorar o código

ENH: Make it unnecessary to ever specify LINK_DIRECTORIES for any library
generated in this project, even when LIBRARY_OUTPUT_PATH is set.

Amitha Perera %!s(int64=24) %!d(string=hai) anos
pai
achega
5e1d9ed39e

+ 4 - 0
Source/cmLinkLibrariesCommand.cxx

@@ -57,6 +57,10 @@ bool cmLinkLibrariesCommand::InitialPass(std::vector<std::string> const& argsIn)
         m_Makefile->AddLinkDirectory( dir );
         m_Makefile->AddLinkDirectory( dir );
         }
         }
       }
       }
+    else
+      {
+      m_Makefile->AddLinkDirectory( ldir );
+      }
     }
     }
   
   
   return true;
   return true;

+ 4 - 0
Source/cmTargetLinkLibrariesCommand.cxx

@@ -60,6 +60,10 @@ bool cmTargetLinkLibrariesCommand::InitialPass(std::vector<std::string> const& a
         m_Makefile->AddLinkDirectory( dir );
         m_Makefile->AddLinkDirectory( dir );
         }
         }
       }
       }
+    else
+      {
+      m_Makefile->AddLinkDirectory( ldir );
+      }
     } 
     } 
   return true;
   return true;
 }
 }