[Cmake-commits] [cmake-commits] alex committed cmExtraCodeBlocksGenerator.cxx 1.34 1.35

[cmake-commits at cmake.org]

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

Modified Files:
	cmExtraCodeBlocksGenerator.cxx 
Log Message:
-make paths with spaces work in the CodeBlocks generator with MinGW (#10014)

Alex 


Index: cmExtraCodeBlocksGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmExtraCodeBlocksGenerator.cxx,v
retrieving revision 1.34
retrieving revision 1.35
diff -C 2 -d -r1.34 -r1.35
*** cmExtraCodeBlocksGenerator.cxx	20 Oct 2009 21:14:12 -0000	1.34
--- cmExtraCodeBlocksGenerator.cxx	24 Jan 2010 20:11:58 -0000	1.35
***************
*** 546,550 ****
    std::string makefileName = makefile->GetStartOutputDirectory();
    makefileName += "/Makefile";
-   makefileName = cmSystemTools::ConvertToOutputPath(makefileName.c_str());
  
    fout<<"      <Target title=\"" << targetName << "\">\n";
--- 546,549 ----
***************
*** 697,702 ****
    if (strcmp(this->GlobalGenerator->GetName(), "NMake Makefiles")==0)
      {
      command += " /NOLOGO /f &quot;";
!     command += makefile;
      command += "&quot; ";
      command += target;
--- 696,702 ----
    if (strcmp(this->GlobalGenerator->GetName(), "NMake Makefiles")==0)
      {
+     std::string makefileName = cmSystemTools::ConvertToOutputPath(makefile);
      command += " /NOLOGO /f &quot;";
!     command += makefileName;
      command += "&quot; ";
      command += target;
***************
*** 704,716 ****
    else if (strcmp(this->GlobalGenerator->GetName(), "MinGW Makefiles")==0)
      {
!     command += " -f ";
!     command += makefile;
!     command += " ";
      command += target;
      }
    else
      {
      command += " -f &quot;";
!     command += makefile;
      command += "&quot; ";
      command += target;
--- 704,720 ----
    else if (strcmp(this->GlobalGenerator->GetName(), "MinGW Makefiles")==0)
      {
!     // no escaping of spaces in this case, see 
!     // http://public.kitware.com/Bug/view.php?id=10014
!     std::string makefileName = makefile; 
!     command += " -f &quot;";
!     command += makefileName;
!     command += "&quot; ";
      command += target;
      }
    else
      {
+     std::string makefileName = cmSystemTools::ConvertToOutputPath(makefile);
      command += " -f &quot;";
!     command += makefileName;
      command += "&quot; ";
      command += target;