[Cmake-commits] [cmake-commits] king committed cmLocalUnixMakefileGenerator3.cxx 1.250 1.251 cmMakefileTargetGenerator.cxx 1.98 1.99

[cmake-commits at cmake.org]

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

Modified Files:
	cmLocalUnixMakefileGenerator3.cxx 
	cmMakefileTargetGenerator.cxx 
Log Message:
BUG: Fix generation of some paths into .cmake files in the build tree to escape strings for the CMake language.  This fix allows users to put double quotes in the SOVERSION of a shared library.


Index: cmLocalUnixMakefileGenerator3.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalUnixMakefileGenerator3.cxx,v
retrieving revision 1.250
retrieving revision 1.251
diff -C 2 -d -r1.250 -r1.251
*** cmLocalUnixMakefileGenerator3.cxx	10 May 2008 22:39:00 -0000	1.250
--- cmLocalUnixMakefileGenerator3.cxx	10 May 2008 22:39:06 -0000	1.251
***************
*** 1111,1116 ****
          f != files.end(); ++f)
        {
!       fout << "\"" << this->Convert(f->c_str(),START_OUTPUT,UNCHANGED) 
!            << "\"\n";
        }
      fout << ")\n";
--- 1111,1116 ----
          f != files.end(); ++f)
        {
!       std::string fc = this->Convert(f->c_str(),START_OUTPUT,UNCHANGED);
!       fout << "  " << this->EscapeForCMake(fc.c_str()) << "\n";
        }
      fout << ")\n";

Index: cmMakefileTargetGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefileTargetGenerator.cxx,v
retrieving revision 1.98
retrieving revision 1.99
diff -C 2 -d -r1.98 -r1.99
*** cmMakefileTargetGenerator.cxx	22 Apr 2008 15:10:19 -0000	1.98
--- cmMakefileTargetGenerator.cxx	10 May 2008 22:39:06 -0000	1.99
***************
*** 934,939 ****
          pi != this->MultipleOutputPairs.end(); ++pi)
        {
!       *this->InfoFileStream << "  \"" << pi->first << "\" \""
!                             << pi->second << "\"\n";
        }
      *this->InfoFileStream << "  )\n\n";
--- 934,941 ----
          pi != this->MultipleOutputPairs.end(); ++pi)
        {
!       *this->InfoFileStream
!         << "  " << this->LocalGenerator->EscapeForCMake(pi->first.c_str())
!         << " "  << this->LocalGenerator->EscapeForCMake(pi->second.c_str())
!         << "\n";
        }
      *this->InfoFileStream << "  )\n\n";