diff options
| author | Brad King <brad.king@kitware.com> | 2017-03-29 13:12:17 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-03-29 13:12:20 (GMT) |
| commit | 2b9086d26614787bbc47b8ee47514583f6814e5d (patch) | |
| tree | ed9cae31887e9b32a29923e177f5ccbe0319a58f /Source | |
| parent | ece20f7ae84db12b4ba95768e6aa5cc7e8832585 (diff) | |
| parent | 7a411dfbf6d9987869fd39e57f38f6a9c3d548aa (diff) | |
| download | CMake-2b9086d26614787bbc47b8ee47514583f6814e5d.zip CMake-2b9086d26614787bbc47b8ee47514583f6814e5d.tar.gz CMake-2b9086d26614787bbc47b8ee47514583f6814e5d.tar.bz2 | |
Merge topic 'vfproj-object-libs-fix'
7a411dfb VS: Fix OBJECT library support in Intel Fortran projects
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !636
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmLocalVisualStudio7Generator.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx index 7c33821..3117ef3 100644 --- a/Source/cmLocalVisualStudio7Generator.cxx +++ b/Source/cmLocalVisualStudio7Generator.cxx @@ -746,11 +746,13 @@ void cmLocalVisualStudio7Generator::WriteConfiguration( if (this->FortranProject) { // Intel Fortran >= 15.0 uses TargetName property. - std::string targetNameFull = target->GetFullName(configName); - std::string targetName = + std::string const targetNameFull = target->GetFullName(configName); + std::string const targetName = cmSystemTools::GetFilenameWithoutLastExtension(targetNameFull); - std::string targetExt = - cmSystemTools::GetFilenameLastExtension(targetNameFull); + std::string const targetExt = + target->GetType() == cmStateEnums::OBJECT_LIBRARY + ? ".lib" + : cmSystemTools::GetFilenameLastExtension(targetNameFull); /* clang-format off */ fout << "\t\t\tTargetName=\"" << this->EscapeForXML(targetName) << "\"\n" |