diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-10-24 11:30:06 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-10-27 06:44:22 (GMT) |
| commit | 6bd7bd1e06fcf92d40c762f2713626d125cb8f87 (patch) | |
| tree | 9aac8e5dd95c843e9e16d71d22dc4aef5a279ea4 | |
| parent | b397eae82e14fdf75eddcbfd022d9f2d5933eb1e (diff) | |
| download | CMake-6bd7bd1e06fcf92d40c762f2713626d125cb8f87.zip CMake-6bd7bd1e06fcf92d40c762f2713626d125cb8f87.tar.gz CMake-6bd7bd1e06fcf92d40c762f2713626d125cb8f87.tar.bz2 | |
Export: Use existing IsDLLPlatform porcelain
| -rw-r--r-- | Source/cmExportBuildFileGenerator.cxx | 6 | ||||
| -rw-r--r-- | Source/cmExportFileGenerator.cxx | 5 |
2 files changed, 2 insertions, 9 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")) diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx index d52ce35..e8a2e6a 100644 --- a/Source/cmExportFileGenerator.cxx +++ b/Source/cmExportFileGenerator.cxx @@ -879,10 +879,7 @@ cmExportFileGenerator if(target->GetType() == cmState::SHARED_LIBRARY || target->GetType() == cmState::MODULE_LIBRARY) { - // Check whether this is a DLL platform. - bool dll_platform = - (mf->IsOn("WIN32") || mf->IsOn("CYGWIN") || mf->IsOn("MINGW")); - if(!dll_platform) + if(!target->IsDLLPlatform()) { std::string prop; std::string value; |