This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake".
The branch, next has been updated via bc35c1bb7b1175e79dd8bc177fb47f8367fae26b (commit) via 7a411dfbf6d9987869fd39e57f38f6a9c3d548aa (commit) from 3b32fdc5d1530368b5b05d009f59bca79759d1c1 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bc35c1bb7b1175e79dd8bc177fb47f8367fae26b commit bc35c1bb7b1175e79dd8bc177fb47f8367fae26b Merge: 3b32fdc 7a411df Author: Brad King <brad.k...@kitware.com> AuthorDate: Tue Mar 28 14:39:31 2017 +0000 Commit: Kitware Robot <kwro...@kitware.com> CommitDate: Tue Mar 28 10:39:33 2017 -0400 Stage topic 'vfproj-object-libs-fix' Topic-id: 23318 Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/636 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7a411dfbf6d9987869fd39e57f38f6a9c3d548aa commit 7a411dfbf6d9987869fd39e57f38f6a9c3d548aa Author: Christian Pfeiffer <cpfeif...@live.de> AuthorDate: Tue Mar 28 11:51:35 2017 +0200 Commit: Brad King <brad.k...@kitware.com> CommitDate: Tue Mar 28 10:34:26 2017 -0400 VS: Fix OBJECT library support in Intel Fortran projects The `TargetExt` for `.vfproj` object libraries should be `.lib` to match the `OutputFile` value. Otherwise Visual Fortran raises warnings: TargetPath(...) does not match the Library's OutputFile property value (...) 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" ----------------------------------------------------------------------- Summary of changes: Source/cmLocalVisualStudio7Generator.cxx | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits