From 5e1d9ed39e252dc3c7bf3310842e5445b0519edc Mon Sep 17 00:00:00 2001 From: Amitha Perera Date: Sun, 28 Apr 2002 16:14:21 -0400 Subject: [PATCH] ENH: Make it unnecessary to ever specify LINK_DIRECTORIES for any library generated in this project, even when LIBRARY_OUTPUT_PATH is set. --- Source/cmLinkLibrariesCommand.cxx | 4 ++++ Source/cmTargetLinkLibrariesCommand.cxx | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/Source/cmLinkLibrariesCommand.cxx b/Source/cmLinkLibrariesCommand.cxx index 1cc8b173e..4024f915c 100644 --- a/Source/cmLinkLibrariesCommand.cxx +++ b/Source/cmLinkLibrariesCommand.cxx @@ -57,6 +57,10 @@ bool cmLinkLibrariesCommand::InitialPass(std::vector const& argsIn) m_Makefile->AddLinkDirectory( dir ); } } + else + { + m_Makefile->AddLinkDirectory( ldir ); + } } return true; diff --git a/Source/cmTargetLinkLibrariesCommand.cxx b/Source/cmTargetLinkLibrariesCommand.cxx index e6d768990..34c57a30e 100644 --- a/Source/cmTargetLinkLibrariesCommand.cxx +++ b/Source/cmTargetLinkLibrariesCommand.cxx @@ -60,6 +60,10 @@ bool cmTargetLinkLibrariesCommand::InitialPass(std::vector const& a m_Makefile->AddLinkDirectory( dir ); } } + else + { + m_Makefile->AddLinkDirectory( ldir ); + } } return true; }