|
|
@@ -1448,22 +1448,6 @@ void cmLocalGenerator::GetTargetFlags(
|
|
|
sharedLibFlags += this->Makefile->GetSafeDefinition(build);
|
|
|
sharedLibFlags += " ";
|
|
|
}
|
|
|
- if (this->Makefile->IsOn("WIN32") &&
|
|
|
- !(this->Makefile->IsOn("CYGWIN") ||
|
|
|
- this->Makefile->IsOn("MINGW"))) {
|
|
|
- std::vector<cmSourceFile*> sources;
|
|
|
- target->GetSourceFiles(sources, config);
|
|
|
- std::string defFlag =
|
|
|
- this->Makefile->GetSafeDefinition("CMAKE_LINK_DEF_FILE_FLAG");
|
|
|
- for (cmSourceFile* sf : sources) {
|
|
|
- if (sf->GetExtension() == "def") {
|
|
|
- sharedLibFlags += defFlag;
|
|
|
- sharedLibFlags +=
|
|
|
- this->ConvertToOutputFormat(sf->ResolveFullPath(), SHELL);
|
|
|
- sharedLibFlags += " ";
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
}
|
|
|
|
|
|
cmValue targetLinkFlags = target->GetProperty("LINK_FLAGS");
|
|
|
@@ -1577,6 +1561,8 @@ void cmLocalGenerator::GetTargetFlags(
|
|
|
this->AppendPositionIndependentLinkerFlags(extraLinkFlags, target, config,
|
|
|
linkLanguage);
|
|
|
this->AppendIPOLinkerFlags(extraLinkFlags, target, config, linkLanguage);
|
|
|
+ this->AppendModuleDefinitionFlag(extraLinkFlags, target, linkLineComputer,
|
|
|
+ config);
|
|
|
|
|
|
if (!extraLinkFlags.empty()) {
|
|
|
linkFlags.emplace_back(std::move(extraLinkFlags));
|