diff options
| author | Brad King <brad.king@kitware.com> | 2006-10-05 20:59:46 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2006-10-05 20:59:46 (GMT) |
| commit | bdf8e186e5084020a4cbbbe9aa2f63af0febf4ff (patch) | |
| tree | f700b98be783c712b91a6ea4558c2df96c362493 /Source/cmLocalGenerator.cxx | |
| parent | e0a662a3ddfe3c906f81b0a070e4de169e46646e (diff) | |
| download | CMake-bdf8e186e5084020a4cbbbe9aa2f63af0febf4ff.zip CMake-bdf8e186e5084020a4cbbbe9aa2f63af0febf4ff.tar.gz CMake-bdf8e186e5084020a4cbbbe9aa2f63af0febf4ff.tar.bz2 | |
BUG: Need to match shared library names before static because some platforms have static name patterns that match their shared patterns but not vice versa. This is needed for implementing bug#1644 on cygwin.
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 84b4902..545b4ca 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -1716,6 +1716,12 @@ void cmLocalGenerator this->Makefile->GetDefinition("CMAKE_STATIC_LIBRARY_PREFIX")); orderLibs.AddLinkPrefix( this->Makefile->GetDefinition("CMAKE_SHARED_LIBRARY_PREFIX")); + + // Import library names should be matched and treated as shared + // libraries for the purposes of linking. + orderLibs.AddLinkExtension( + this->Makefile->GetDefinition("CMAKE_IMPORT_LIBRARY_SUFFIX"), + cmOrderLinkDirectories::LinkShared); orderLibs.AddLinkExtension( this->Makefile->GetDefinition("CMAKE_STATIC_LIBRARY_SUFFIX"), cmOrderLinkDirectories::LinkStatic); @@ -1723,8 +1729,6 @@ void cmLocalGenerator this->Makefile->GetDefinition("CMAKE_SHARED_LIBRARY_SUFFIX"), cmOrderLinkDirectories::LinkShared); orderLibs.AddLinkExtension( - this->Makefile->GetDefinition("CMAKE_IMPORT_LIBRARY_SUFFIX")); - orderLibs.AddLinkExtension( this->Makefile->GetDefinition("CMAKE_LINK_LIBRARY_SUFFIX")); if(const char* linkSuffixes = this->Makefile->GetDefinition("CMAKE_EXTRA_LINK_EXTENSIONS")) |