kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Export: Use existing IsDLLPlatform porcelain

Browse Source
This commit is contained in:
Stephen Kelly 2015-10-24 13:30:06 +02:00
parent b397eae82e
commit 6bd7bd1e06
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmExportBuildFileGenerator.cxx
View File

@ -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"))

5
Source/cmExportFileGenerator.cxx
View File

@ -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;