[Cmake-commits] [cmake-commits] king committed cmDependsFortran.cxx 1.50 1.51

[cmake-commits at cmake.org]

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

Modified Files:
	cmDependsFortran.cxx 
Log Message:
Fix escapes in Fortran depend.make entries

Makefile dependencies must be escaped using cmLocalGenerator::Convert
with the cmLocalGenerator::MAKEFILE option.  This fixes Fortran module
dependencies with spaces in the path.  We test the fix by adding a space
to one of the module paths in the Fortran test.


Index: cmDependsFortran.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmDependsFortran.cxx,v
retrieving revision 1.50
retrieving revision 1.51
diff -C 2 -d -r1.50 -r1.51
*** cmDependsFortran.cxx	28 Sep 2009 15:42:12 -0000	1.50
--- cmDependsFortran.cxx	4 Jan 2010 15:18:39 -0000	1.51
***************
*** 443,449 ****
        i != info.Includes.end(); ++i)
      {
!     makeDepends << obj << ": "
!        << cmSystemTools::ConvertToOutputPath(i->c_str()).c_str()
!        << std::endl;
      internalDepends << " " << i->c_str() << std::endl;
      }
--- 443,451 ----
        i != info.Includes.end(); ++i)
      {
!     makeDepends << obj << ": " <<
!       this->LocalGenerator->Convert(i->c_str(),
!                                     cmLocalGenerator::HOME_OUTPUT,
!                                     cmLocalGenerator::MAKEFILE)
!                 << std::endl;
      internalDepends << " " << i->c_str() << std::endl;
      }
***************
*** 492,496 ****
          this->LocalGenerator->Convert(required->second.c_str(),
                                        cmLocalGenerator::HOME_OUTPUT,
!                                       cmLocalGenerator::SHELL);
        makeDepends << obj << ": " << stampFile << "\n";
        }
--- 494,498 ----
          this->LocalGenerator->Convert(required->second.c_str(),
                                        cmLocalGenerator::HOME_OUTPUT,
!                                       cmLocalGenerator::MAKEFILE);
        makeDepends << obj << ": " << stampFile << "\n";
        }
***************
*** 505,509 ****
            this->LocalGenerator->Convert(module.c_str(),
                                          cmLocalGenerator::HOME_OUTPUT,
!                                         cmLocalGenerator::SHELL);
          makeDepends << obj << ": " << module << "\n";
          }
--- 507,511 ----
            this->LocalGenerator->Convert(module.c_str(),
                                          cmLocalGenerator::HOME_OUTPUT,
!                                         cmLocalGenerator::MAKEFILE);
          makeDepends << obj << ": " << module << "\n";
          }