mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-06 06:38:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'vfproj-object-libs-fix'

Browse Source 
7a411dfb VS: Fix OBJECT library support in Intel Fortran projects

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !636
This commit is contained in:
Brad King
2017-03-29 13:12:17 +00:00
committed by Kitware Robot
parent ece20f7ae8 7a411dfbf6
commit 2b9086d266
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Source/cmLocalVisualStudio7Generator.cxx
View File

@@ -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"