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 853a0e370cde10035906d6f68aacf1e13fdd2bb1 (commit)
via 0f55f2547f45090d093a6f0871b107bf1fac4458 (commit)
via 0f9dbc1608969c3b2dd7e4842e338fa5f90f0b43 (commit)
from 37c294a775cd2a7dc3a34553b271b1dc7738dd2d (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=853a0e370cde10035906d6f68aacf1e13fdd2bb1
commit 853a0e370cde10035906d6f68aacf1e13fdd2bb1
Merge: 37c294a 0f55f25
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Feb 27 09:57:01 2014 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Feb 27 09:57:01 2014 -0500
Merge topic 'vs-Fortran-use-OBJECT-lib' into next
0f55f254 VS: For Intel Fortran .vfproj put OBJECT libs in link line (#14777)
0f9dbc16 CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0f55f2547f45090d093a6f0871b107bf1fac4458
commit 0f55f2547f45090d093a6f0871b107bf1fac4458
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Feb 27 09:53:16 2014 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Thu Feb 27 09:53:16 2014 -0500
VS: For Intel Fortran .vfproj put OBJECT libs in link line (#14777)
The Intel Fortran .vfproj format accepts the $(Configuration) placeholder
in the path to an input file but appears to consider it always out of
date. Therefore adding OBJECT library objects as external object source
files causes the referencing binary to re-link on every build. Work
around this problem by putting OBJECT library objects on the link line
as is done for VS < 8 already.
diff --git a/Source/cmLocalVisualStudio7Generator.cxx
b/Source/cmLocalVisualStudio7Generator.cxx
index ce24d8d..d11bf55 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -1044,7 +1044,7 @@ void
cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
fout << "\t\t\t<Tool\n"
<< "\t\t\t\tName=\"" << tool << "\"\n";
- if(this->GetVersion() < VS8)
+ if(this->GetVersion() < VS8 || this->FortranProject)
{
cmOStringStream libdeps;
this->Internal->OutputObjects(libdeps, &target);
@@ -1104,7 +1104,7 @@ void
cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
// libraries which may be set by the user to something bad.
fout << "\t\t\t\tAdditionalDependencies=\"$(NOINHERIT) "
<< this->Makefile->GetSafeDefinition(standardLibsVar.c_str());
- if(this->GetVersion() < VS8)
+ if(this->GetVersion() < VS8 || this->FortranProject)
{
this->Internal->OutputObjects(fout, &target, " ");
}
@@ -1202,7 +1202,7 @@ void
cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
// libraries which may be set by the user to something bad.
fout << "\t\t\t\tAdditionalDependencies=\"$(NOINHERIT) "
<< this->Makefile->GetSafeDefinition(standardLibsVar.c_str());
- if(this->GetVersion() < VS8)
+ if(this->GetVersion() < VS8 || this->FortranProject)
{
this->Internal->OutputObjects(fout, &target, " ");
}
@@ -1423,7 +1423,7 @@ void
cmLocalVisualStudio7Generator::WriteVCProjFile(std::ostream& fout,
this->WriteGroup(&sg, target, fout, libName, configs);
}
- if(this->GetVersion() >= VS8)
+ if(this->GetVersion() >= VS8 && !this->FortranProject)
{
// VS >= 8 support per-config source locations so we
// list object library content as external objects.
-----------------------------------------------------------------------
Summary of changes:
Source/CMakeVersion.cmake | 2 +-
Source/cmLocalVisualStudio7Generator.cxx | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
