diff options
| author | Brad King <brad.king@kitware.com> | 2017-03-09 20:28:14 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-03-09 21:25:14 (GMT) |
| commit | 25d261efa7c80ce7d9cbcb8b94d5d4a77cb12aaf (patch) | |
| tree | d6b00210307b010f08388a337fdb5b879be25bd3 /Source/cmNinjaTargetGenerator.cxx | |
| parent | 1e0a9ac45d51e0076222026b9c44604b287a6eae (diff) | |
| download | CMake-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/cmNinjaTargetGenerator.cxx')
| -rw-r--r-- | Source/cmNinjaTargetGenerator.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx index b1f26e4..0e10ab4 100644 --- a/Source/cmNinjaTargetGenerator.cxx +++ b/Source/cmNinjaTargetGenerator.cxx @@ -212,9 +212,10 @@ cmNinjaDeps cmNinjaTargetGenerator::ComputeLinkDeps() const std::transform(deps.begin(), deps.end(), result.begin(), MapToNinjaPath()); // Add a dependency on the link definitions file, if any. - if (this->ModuleDefinitionFile) { - result.push_back( - this->ConvertToNinjaPath(this->ModuleDefinitionFile->GetFullPath())); + cmGeneratorTarget::ModuleDefinitionInfo const* mdi = + this->GeneratorTarget->GetModuleDefinitionInfo(this->GetConfigName()); + if (mdi && !mdi->DefFile.empty()) { + result.push_back(this->ConvertToNinjaPath(mdi->DefFile)); } // Add a dependency on user-specified manifest files, if any. |