[Cmake-commits] [cmake-commits] king committed cmLocalGenerator.cxx 1.284 1.285 cmMakefileTargetGenerator.cxx 1.104 1.105

[cmake-commits at cmake.org]

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

Modified Files:
	cmLocalGenerator.cxx cmMakefileTargetGenerator.cxx 
Log Message:
ENH: Simplify framework -F flag generation

This removes an unnecessary use of ConvertToOutputForExisting which is
needed only on Windows to consider short-pathing.


Index: cmLocalGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalGenerator.cxx,v
retrieving revision 1.284
retrieving revision 1.285
diff -C 2 -d -r1.284 -r1.285
*** cmLocalGenerator.cxx	2 Sep 2008 16:06:32 -0000	1.284
--- cmLocalGenerator.cxx	9 Oct 2008 19:07:35 -0000	1.285
***************
*** 1156,1162 ****
        if(emitted.insert(frameworkDir).second)
          {
!         includeFlags 
!           << "-F" 
!           << this->ConvertToOutputForExisting(frameworkDir.c_str()) << " ";
          }
        continue;
--- 1156,1164 ----
        if(emitted.insert(frameworkDir).second)
          {
!         includeFlags
!           << "-F" << this->Convert(frameworkDir.c_str(),
!                                    cmLocalGenerator::START_OUTPUT,
!                                    cmLocalGenerator::SHELL, true)
!           << " ";
          }
        continue;

Index: cmMakefileTargetGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefileTargetGenerator.cxx,v
retrieving revision 1.104
retrieving revision 1.105
diff -C 2 -d -r1.104 -r1.105
*** cmMakefileTargetGenerator.cxx	15 Sep 2008 17:30:17 -0000	1.104
--- cmMakefileTargetGenerator.cxx	9 Oct 2008 19:07:35 -0000	1.105
***************
*** 1453,1457 ****
        {
        flags += "-F";
!       flags += this->LocalGenerator->ConvertToOutputForExisting(i->c_str());
        flags += " ";
        }
--- 1453,1459 ----
        {
        flags += "-F";
!       flags += this->Convert(i->c_str(),
!                              cmLocalGenerator::START_OUTPUT,
!                              cmLocalGenerator::SHELL, true);
        flags += " ";
        }