[Cmake-commits] [cmake-commits] king committed cmLocalGenerator.cxx 1.277 1.278

[cmake-commits at cmake.org]

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

Modified Files:
	cmLocalGenerator.cxx 
Log Message:
BUG: Fix escaping in link scripts

When generating escape sequences for the native build tool do not put in
Makefile escapes for paths generated into link scripts.  This fixes
putting "$ORIGIN" into the RPATH, and probably some other subtle
problems.


Index: cmLocalGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalGenerator.cxx,v
retrieving revision 1.277
retrieving revision 1.278
diff -C 2 -d -r1.277 -r1.278
*** cmLocalGenerator.cxx	30 Jul 2008 14:44:57 -0000	1.277
--- cmLocalGenerator.cxx	5 Aug 2008 13:55:02 -0000	1.278
***************
*** 2580,2584 ****
      flags |= cmsysSystem_Shell_Flag_VSIDE;
      }
!   else
      {
      flags |= cmsysSystem_Shell_Flag_Make;
--- 2580,2584 ----
      flags |= cmsysSystem_Shell_Flag_VSIDE;
      }
!   else if(!this->LinkScriptShell)
      {
      flags |= cmsysSystem_Shell_Flag_Make;