[Cmake-commits] [cmake-commits] king committed cmMakefileTargetGenerator.cxx 1.124 1.125

[cmake-commits at cmake.org]

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

Modified Files:
	cmMakefileTargetGenerator.cxx 
Log Message:
Fix module definition file reference for VS6 NMake

When building through NMake with VS 6, the module definition file must
be passed without spaces in the path.  This is because 'cl -link' does
not escape the spaces when passing the value on to the linker.


Index: cmMakefileTargetGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefileTargetGenerator.cxx,v
retrieving revision 1.124
retrieving revision 1.125
diff -C 2 -d -r1.124 -r1.125
*** cmMakefileTargetGenerator.cxx	29 Sep 2009 20:39:07 -0000	1.124
--- cmMakefileTargetGenerator.cxx	30 Sep 2009 14:12:54 -0000	1.125
***************
*** 1756,1764 ****
      }
  
!   // Append the flag and value.
    std::string flag = defFileFlag;
!   flag += this->Convert(this->ModuleDefinitionFile.c_str(),
!                         cmLocalGenerator::START_OUTPUT,
!                         cmLocalGenerator::SHELL);
    this->LocalGenerator->AppendFlags(flags, flag.c_str());
  }
--- 1756,1764 ----
      }
  
!   // Append the flag and value.  Use ConvertToLinkReference to help
!   // vs6's "cl -link" pass it to the linker.
    std::string flag = defFileFlag;
!   flag += (this->LocalGenerator->ConvertToLinkReference(
!              this->ModuleDefinitionFile.c_str()));
    this->LocalGenerator->AppendFlags(flags, flag.c_str());
  }