diff options
| author | Amitha Perera <perera@cs.rpi.edu> | 2002-04-28 20:14:21 (GMT) |
|---|---|---|
| committer | Amitha Perera <perera@cs.rpi.edu> | 2002-04-28 20:14:21 (GMT) |
| commit | 5e1d9ed39e252dc3c7bf3310842e5445b0519edc (patch) | |
| tree | 059b8f348c18fdec7e98cf0771737fb072ceed0e | |
| parent | 2ba1ee8672911622d16b1914076fd0df63c62cdb (diff) | |
| download | CMake-5e1d9ed39e252dc3c7bf3310842e5445b0519edc.zip CMake-5e1d9ed39e252dc3c7bf3310842e5445b0519edc.tar.gz CMake-5e1d9ed39e252dc3c7bf3310842e5445b0519edc.tar.bz2 | |
ENH: Make it unnecessary to ever specify LINK_DIRECTORIES for any library
generated in this project, even when LIBRARY_OUTPUT_PATH is set.
| -rw-r--r-- | Source/cmLinkLibrariesCommand.cxx | 4 | ||||
| -rw-r--r-- | Source/cmTargetLinkLibrariesCommand.cxx | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/Source/cmLinkLibrariesCommand.cxx b/Source/cmLinkLibrariesCommand.cxx index 1cc8b17..4024f91 100644 --- a/Source/cmLinkLibrariesCommand.cxx +++ b/Source/cmLinkLibrariesCommand.cxx @@ -57,6 +57,10 @@ bool cmLinkLibrariesCommand::InitialPass(std::vector<std::string> const& argsIn) m_Makefile->AddLinkDirectory( dir ); } } + else + { + m_Makefile->AddLinkDirectory( ldir ); + } } return true; diff --git a/Source/cmTargetLinkLibrariesCommand.cxx b/Source/cmTargetLinkLibrariesCommand.cxx index e6d7689..34c57a3 100644 --- a/Source/cmTargetLinkLibrariesCommand.cxx +++ b/Source/cmTargetLinkLibrariesCommand.cxx @@ -60,6 +60,10 @@ bool cmTargetLinkLibrariesCommand::InitialPass(std::vector<std::string> const& a m_Makefile->AddLinkDirectory( dir ); } } + else + { + m_Makefile->AddLinkDirectory( ldir ); + } } return true; } |