diff options
| author | Brad King <brad.king@kitware.com> | 2015-10-28 12:48:05 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-10-28 12:48:05 (GMT) |
| commit | 1e8c920d0409770214a4ff517f6a4c31b9830f45 (patch) | |
| tree | 410a1db66807d83a4f376da4ba8230dac5b94914 /Source/cmExportBuildFileGenerator.cxx | |
| parent | 27570a6d0ea6df41a7792ce2c3ba2f0c9e1916df (diff) | |
| parent | 79c3a2a8f72ea175533da9f323f88c507220486e (diff) | |
| download | CMake-1e8c920d0409770214a4ff517f6a4c31b9830f45.zip CMake-1e8c920d0409770214a4ff517f6a4c31b9830f45.tar.gz CMake-1e8c920d0409770214a4ff517f6a4c31b9830f45.tar.bz2 | |
Merge topic 'use-generator-target'
79c3a2a8 cmGlobalGenerator: Remove map from cmTarget to cmGeneratorTarget
c389f8bb cmLocalGenerator: Port Find method away from GetGeneratorTarget
02533038 VS6: Port to FindGeneratorTarget
b6278e9f cmake: Port find_package mode away from GetGeneratorTarget
7a6caae1 cmMakefile: Add imported target accessor
0fb187cc CMP0026: Port away from GetGeneratorTarget
8caf1f36 cmGlobalGenerator: Add FindGeneratorTarget API
278ba2db cmGeneratorTarget: Add API for globally visible IMPORTED
79c11d23 Xcode: Port away from GetGeneratorTarget
9b244cc0 cmLocalGenerator: Store imported targets in a separate container.
def6da61 cmLocalGenerator: Port FindGeneratorTarget away from GetGeneratorTarget
a67231ac cmTarget: Implement ALIAS in terms of name mapping
d566f39a cmGlobalGenerator: Remove unneeded GetGeneratorTarget
0c97d32f cmGlobalGenerator: Remove direct storage of targets
383bfd95 cmTargetCollectLinkLanguages: Remove cmMakefile dependency
7f6bedda cmGeneratorTarget: Port cmOptionalLinkImplementation
...
Diffstat (limited to 'Source/cmExportBuildFileGenerator.cxx')
| -rw-r--r-- | Source/cmExportBuildFileGenerator.cxx | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx index 23c11d7..9e36539 100644 --- a/Source/cmExportBuildFileGenerator.cxx +++ b/Source/cmExportBuildFileGenerator.cxx @@ -213,12 +213,8 @@ cmExportBuildFileGenerator properties[prop] = value; } - // Check whether this is a DLL platform. - bool dll_platform = - (mf->IsOn("WIN32") || mf->IsOn("CYGWIN") || mf->IsOn("MINGW")); - // Add the import library for windows DLLs. - if(dll_platform && + if(target->IsDLLPlatform() && (target->GetType() == cmState::SHARED_LIBRARY || target->IsExecutableWithExports()) && mf->GetDefinition("CMAKE_IMPORT_LIBRARY_SUFFIX")) |