summaryrefslogtreecommitdiffstats
path: root/Source/cmMakefileTargetGenerator.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-03-09 20:28:14 (GMT)
committerBrad King <brad.king@kitware.com>2017-03-09 21:25:14 (GMT)
commit25d261efa7c80ce7d9cbcb8b94d5d4a77cb12aaf (patch)
treed6b00210307b010f08388a337fdb5b879be25bd3 /Source/cmMakefileTargetGenerator.cxx
parent1e0a9ac45d51e0076222026b9c44604b287a6eae (diff)
downloadCMake-25d261efa7c80ce7d9cbcb8b94d5d4a77cb12aaf.zip
CMake-25d261efa7c80ce7d9cbcb8b94d5d4a77cb12aaf.tar.gz
CMake-25d261efa7c80ce7d9cbcb8b94d5d4a77cb12aaf.tar.bz2
Refactor module definition file selection
Create a `ModuleDefinitionInfo` structure for each configuration of a target to hold corresponding information about the selected module definition file (`.def` source).
Diffstat (limited to 'Source/cmMakefileTargetGenerator.cxx')
-rw-r--r--Source/cmMakefileTargetGenerator.cxx6
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 54b3f36..d9361f3 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -1414,8 +1414,10 @@ void cmMakefileTargetGenerator::AppendLinkDepends(
this->AppendTargetDepends(depends);
// Add a dependency on the link definitions file, if any.
- if (this->ModuleDefinitionFile) {
- depends.push_back(this->ModuleDefinitionFile->GetFullPath());
+ cmGeneratorTarget::ModuleDefinitionInfo const* mdi =
+ this->GeneratorTarget->GetModuleDefinitionInfo(this->GetConfigName());
+ if (mdi && !mdi->DefFile.empty()) {
+ depends.push_back(mdi->DefFile);
}
// Add a dependency on user-specified manifest files, if any.