diff --git a/Source/cmLinkLibrariesCommand.cxx b/Source/cmLinkLibrariesCommand.cxx index 2e28dfade..b3c297ac6 100644 --- a/Source/cmLinkLibrariesCommand.cxx +++ b/Source/cmLinkLibrariesCommand.cxx @@ -70,12 +70,17 @@ bool cmLinkLibrariesCommand::InitialPass(std::vector 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; }