[Cmake-commits] [cmake-commits] king committed cmLocalVisualStudio7Generator.cxx 1.255 1.256

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv28031/Source

Modified Files:
	cmLocalVisualStudio7Generator.cxx 
Log Message:
Avoid C++ linker language in VS Fortran project

In Visual Studio project files we pass compiler flags to the whole
target based on the linker language, which works for MS tools and
combinations of C and C++.  For the Intel Fortran plugin though the
generated .vfproj files should never contain C or C++ options.

We generate .vfproj files only for targets consisting only of Fortran
code.  Now that the linker language is computed transitively through
linking it is possible that the linker language is C++ for an otherwise
Fortran-only project.  This commit forces Fortran as the linker language
for the purpose of specifying target-wide flags in .vfproj files.

See issue #9719.


Index: cmLocalVisualStudio7Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalVisualStudio7Generator.cxx,v
retrieving revision 1.255
retrieving revision 1.256
diff -C 2 -d -r1.255 -r1.256
*** cmLocalVisualStudio7Generator.cxx	29 Sep 2009 20:39:07 -0000	1.255
--- cmLocalVisualStudio7Generator.cxx	19 Oct 2009 19:21:01 -0000	1.256
***************
*** 589,593 ****
    if(strcmp(configType, "10") != 0)
      {
!     const char* linkLanguage = target.GetLinkerLanguage(configName);
      if(!linkLanguage)
        {
--- 589,594 ----
    if(strcmp(configType, "10") != 0)
      {
!     const char* linkLanguage = (this->FortranProject? "Fortran":
!                                 target.GetLinkerLanguage(configName));
      if(!linkLanguage)
        {