diff options
| author | Tim Grothe <Tim.Grothe@gmail.com> | 2015-11-02 14:24:25 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-11-04 14:15:14 (GMT) |
| commit | 247c168b987a8c9c479112c13078aa2e5db37773 (patch) | |
| tree | 35fd3e112fc2595018f4ff825d21b37675bfe715 /Source/cmCommonTargetGenerator.cxx | |
| parent | adfc8a677e51772d87a3e050477c60ce0b70288f (diff) | |
| download | CMake-247c168b987a8c9c479112c13078aa2e5db37773.zip CMake-247c168b987a8c9c479112c13078aa2e5db37773.tar.gz CMake-247c168b987a8c9c479112c13078aa2e5db37773.tar.bz2 | |
Refactor `.def` file lookup
Return a `cmSourceFile const*` from GetModuleDefinitionFile so that
callers can get more information than just the path to the file.
Diffstat (limited to 'Source/cmCommonTargetGenerator.cxx')
| -rw-r--r-- | Source/cmCommonTargetGenerator.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmCommonTargetGenerator.cxx b/Source/cmCommonTargetGenerator.cxx index bd47715..76ed038 100644 --- a/Source/cmCommonTargetGenerator.cxx +++ b/Source/cmCommonTargetGenerator.cxx @@ -81,7 +81,7 @@ void cmCommonTargetGenerator::AddFeatureFlags( //---------------------------------------------------------------------------- void cmCommonTargetGenerator::AddModuleDefinitionFlag(std::string& flags) { - if(this->ModuleDefinitionFile.empty()) + if(!this->ModuleDefinitionFile) { return; } @@ -98,7 +98,7 @@ void cmCommonTargetGenerator::AddModuleDefinitionFlag(std::string& flags) // vs6's "cl -link" pass it to the linker. std::string flag = defFileFlag; flag += (this->LocalGenerator->ConvertToLinkReference( - this->ModuleDefinitionFile)); + this->ModuleDefinitionFile->GetFullPath())); this->LocalGenerator->AppendFlags(flags, flag); } |