diff options
author | Brad King <brad.king@kitware.com> | 2007-03-09 14:30:16 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2007-03-09 14:30:16 (GMT) |
commit | 528f60f4a60440097a4a4997cdf59f0e564ba370 (patch) | |
tree | aa22bf1a28cf33e62664cac46a33c43f0727a70f /Source/cmLocalGenerator.cxx | |
parent | 3ec0ff05de74dc2a51461b0345d0d0e6fe0786b6 (diff) | |
download | CMake-528f60f4a60440097a4a4997cdf59f0e564ba370.zip CMake-528f60f4a60440097a4a4997cdf59f0e564ba370.tar.gz CMake-528f60f4a60440097a4a4997cdf59f0e564ba370.tar.bz2 |
ENH: Added implib option to cmTarget::GetDirectory to support a separate directory containing the import library. This is an incremental step for bug#4210.
Diffstat (limited to 'Source/cmLocalGenerator.cxx')
-rw-r--r-- | Source/cmLocalGenerator.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 8184a8e..4556715 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -1619,6 +1619,10 @@ void cmLocalGenerator linkType = cmTarget::DEBUG; } + // Check whether we should use an import library for linking a target. + bool implib = + this->Makefile->GetDefinition("CMAKE_IMPORT_LIBRARY_SUFFIX")?true:false; + // Get the list of libraries against which this target wants to link. std::vector<std::string> linkLibraries; const cmTarget::LinkLibraryVectorType& inLibs = target.GetLinkLibraries(); @@ -1658,9 +1662,9 @@ void cmLocalGenerator // Pass the full path to the target file but purposely leave // off the per-configuration subdirectory. The link directory // ordering knows how to deal with this. - std::string linkItem = tgt->GetDirectory(0); + std::string linkItem = tgt->GetDirectory(0, implib); linkItem += "/"; - linkItem += tgt->GetFullName(config); + linkItem += tgt->GetFullName(config, implib); linkLibraries.push_back(linkItem); // For full path, use the true location. if(fullPathLibs) |