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

[cmake-commits at cmake.org]

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

Modified Files:
	cmLocalGenerator.cxx 
Log Message:
BUG: Do not convert RPATH entries to full path.

When generating RPATH entries on the link line using a repeated linker
flag (-R ... -R ... style) do not convert individual entries to a full
path.  We need to preserve what the user requested.


Index: cmLocalGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalGenerator.cxx,v
retrieving revision 1.278
retrieving revision 1.279
diff -C 2 -d -r1.278 -r1.279
*** cmLocalGenerator.cxx	5 Aug 2008 13:55:02 -0000	1.278
--- cmLocalGenerator.cxx	5 Aug 2008 13:55:08 -0000	1.279
***************
*** 1574,1578 ****
        {
        rpath += cli.GetRuntimeFlag();
!       rpath += this->Convert(ri->c_str(), FULL, SHELL, false);
        rpath += " ";
        }
--- 1574,1578 ----
        {
        rpath += cli.GetRuntimeFlag();
!       rpath += this->Convert(ri->c_str(), NONE, SHELL, false);
        rpath += " ";
        }