diff options
| author | Brad King <brad.king@kitware.com> | 2017-04-17 14:29:27 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-04-17 14:29:37 (GMT) |
| commit | d4db7a2ec0c4f1ebbfc98984672793f5d9eb2744 (patch) | |
| tree | b101d5ca74a06ca633ff2b835c3fa968da5561db /Source | |
| parent | c0323cbf5f407e9a231c8e7d55801ef3723748bd (diff) | |
| parent | 9a5dcc32676a24a2dd282330839ce48d84c3da67 (diff) | |
| download | CMake-d4db7a2ec0c4f1ebbfc98984672793f5d9eb2744.zip CMake-d4db7a2ec0c4f1ebbfc98984672793f5d9eb2744.tar.gz CMake-d4db7a2ec0c4f1ebbfc98984672793f5d9eb2744.tar.bz2 | |
Merge topic 'simpler-import-lib-check'
9a5dcc32 cmExportBuildFileGenerator: use HasImportLibrary
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !699
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmExportBuildFileGenerator.cxx | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx index 0c25268..539d854 100644 --- a/Source/cmExportBuildFileGenerator.cxx +++ b/Source/cmExportBuildFileGenerator.cxx @@ -185,9 +185,7 @@ void cmExportBuildFileGenerator::SetImportLocationProperty( } // Add the import library for windows DLLs. - if (target->IsDLLPlatform() && - (target->GetType() == cmStateEnums::SHARED_LIBRARY || - target->IsExecutableWithExports()) && + if (target->HasImportLibrary() && mf->GetDefinition("CMAKE_IMPORT_LIBRARY_SUFFIX")) { std::string prop = "IMPORTED_IMPLIB"; prop += suffix; |