[Cmake-commits] [cmake-commits] hoffman committed cmCommandArgumentParserHelper.cxx 1.20.4.1 1.20.4.2 cmExtraCodeBlocksGenerator.cxx 1.18.2.2 1.18.2.3 cmExtraEclipseCDT4Generator.cxx 1.13.2.4 1.13.2.5 cmExtraEclipseCDT4Generator.h 1.4.2.1 1.4.2.2 cmGlobalNMakeMakefileGenerator.cxx 1.26.2.1 1.26.2.2 cmGlobalUnixMakefileGenerator3.h 1.55.2.1 1.55.2.2 cmIncludeDirectoryCommand.cxx 1.30 1.30.2.1 cmLocalUnixMakefileGenerator3.cxx 1.240.2.9 1.240.2.10 cmLocalUnixMakefileGenerator3.h 1.82.2.1 1.82.2.2 cmLocalVisualStudio6Generator.cxx 1.141.2.4 1.141.2.5 cmMakefile.cxx 1.463.2.13 1.463.2.14 cmProjectCommand.h 1.16 1.16.2.1 cmSourceFile.cxx 1.47.2.5 1.47.2.6 cmStringCommand.h 1.28 1.28.2.1 cmTarget.cxx 1.207.2.14 1.207.2.15

cmake-commits at cmake.org cmake-commits at cmake.org
Fri Mar 27 11:56:50 EDT 2009


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

Modified Files:
      Tag: CMake-2-6
	cmCommandArgumentParserHelper.cxx 
	cmExtraCodeBlocksGenerator.cxx cmExtraEclipseCDT4Generator.cxx 
	cmExtraEclipseCDT4Generator.h 
	cmGlobalNMakeMakefileGenerator.cxx 
	cmGlobalUnixMakefileGenerator3.h cmIncludeDirectoryCommand.cxx 
	cmLocalUnixMakefileGenerator3.cxx 
	cmLocalUnixMakefileGenerator3.h 
	cmLocalVisualStudio6Generator.cxx cmMakefile.cxx 
	cmProjectCommand.h cmSourceFile.cxx cmStringCommand.h 
	cmTarget.cxx 
Log Message:
ENH: merge in from main tree to create RC 2


Index: cmLocalUnixMakefileGenerator3.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalUnixMakefileGenerator3.h,v
retrieving revision 1.82.2.1
retrieving revision 1.82.2.2
diff -C 2 -d -r1.82.2.1 -r1.82.2.2
*** cmLocalUnixMakefileGenerator3.h	24 Oct 2008 15:18:52 -0000	1.82.2.1
--- cmLocalUnixMakefileGenerator3.h	27 Mar 2009 15:56:34 -0000	1.82.2.2
***************
*** 283,287 ****
                                   std::set<cmStdString> &emitted);
  
!   // this method Writes the Directory informaiton files
    void WriteDirectoryInformationFile();
  
--- 283,287 ----
                                   std::set<cmStdString> &emitted);
  
!   // this method Writes the Directory information files
    void WriteDirectoryInformationFile();
  

Index: cmGlobalNMakeMakefileGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalNMakeMakefileGenerator.cxx,v
retrieving revision 1.26.2.1
retrieving revision 1.26.2.2
diff -C 2 -d -r1.26.2.1 -r1.26.2.2
*** cmGlobalNMakeMakefileGenerator.cxx	24 Oct 2008 15:18:46 -0000	1.26.2.1
--- cmGlobalNMakeMakefileGenerator.cxx	27 Mar 2009 15:56:10 -0000	1.26.2.2
***************
*** 36,41 ****
    mf->AddDefinition("CMAKE_GENERATOR_CXX", "cl");
    if(!(cmSystemTools::GetEnv("INCLUDE") && 
!        cmSystemTools::GetEnv("LIB") &&
!        cmSystemTools::GetEnv("LIBPATH"))
      )
      {
--- 36,40 ----
    mf->AddDefinition("CMAKE_GENERATOR_CXX", "cl");
    if(!(cmSystemTools::GetEnv("INCLUDE") && 
!        cmSystemTools::GetEnv("LIB"))
      )
      {

Index: cmExtraCodeBlocksGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmExtraCodeBlocksGenerator.cxx,v
retrieving revision 1.18.2.2
retrieving revision 1.18.2.3
diff -C 2 -d -r1.18.2.2 -r1.18.2.3
*** cmExtraCodeBlocksGenerator.cxx	13 Jan 2009 18:03:52 -0000	1.18.2.2
--- cmExtraCodeBlocksGenerator.cxx	27 Mar 2009 15:55:59 -0000	1.18.2.3
***************
*** 231,235 ****
  
    // Collect all used source files in the project
!   std::map<std::string, std::string> sourceFiles;
    for (std::vector<cmLocalGenerator*>::const_iterator lg=lgs.begin();
         lg!=lgs.end(); lg++)
--- 231,238 ----
  
    // Collect all used source files in the project
!   // Sort them into two containers, one for C/C++ implementation files
!   // which may have an acompanying header, one for all other files
!   std::map<std::string, cmSourceFile*> cFiles;
!   std::set<std::string> otherFiles;
    for (std::vector<cmLocalGenerator*>::const_iterator lg=lgs.begin();
         lg!=lgs.end(); lg++)
***************
*** 251,255 ****
                 si!=sources.end(); si++)
              {
!             sourceFiles[(*si)->GetFullPath()] = ti->first;
              }
            }
--- 254,283 ----
                 si!=sources.end(); si++)
              {
!             // check whether it is a C/C++ implementation file
!             bool isCFile = false;
!             if ((*si)->GetLanguage() && (*(*si)->GetLanguage() == 'C'))
!               {
!               for(std::vector<std::string>::const_iterator
!                   ext = mf->GetSourceExtensions().begin();
!                   ext !=  mf->GetSourceExtensions().end(); 
!                   ++ext)
!                 {
!                 if ((*si)->GetExtension() == *ext)
!                   {
!                   isCFile = true;
!                   break;
!                   }
!                 }
!               }
! 
!             // then put it accordingly into one of the two containers
!             if (isCFile)
!               {
!               cFiles[(*si)->GetFullPath()] = *si ;
!               }
!             else
!               {
!               otherFiles.insert((*si)->GetFullPath());
!               }
              }
            }
***************
*** 260,270 ****
      }
  
!   // insert all used source files in the CodeBlocks project
!   for (std::map<std::string, std::string>::const_iterator 
!        sit=sourceFiles.begin();
!        sit!=sourceFiles.end();
         ++sit)
    {
!   fout<<"      <Unit filename=\""<<sit->first <<"\">\n"
          "      </Unit>\n";
    }
--- 288,346 ----
      }
  
!   // The following loop tries to add header files matching to implementation
!   // files to the project. It does that by iterating over all source files,
!   // replacing the file name extension with ".h" and checks whether such a 
!   // file exists. If it does, it is inserted into the map of files.
!   // A very similar version of that code exists also in the kdevelop
!   // project generator.
!   for (std::map<std::string, cmSourceFile*>::const_iterator 
!        sit=cFiles.begin();
!        sit!=cFiles.end();
!        ++sit)
!     {
!     std::string headerBasename=cmSystemTools::GetFilenamePath(sit->first);
!     headerBasename+="/";
!     headerBasename+=cmSystemTools::GetFilenameWithoutExtension(sit->first);
! 
!     // check if there's a matching header around
!     for(std::vector<std::string>::const_iterator
!         ext = mf->GetHeaderExtensions().begin();
!         ext !=  mf->GetHeaderExtensions().end(); 
!         ++ext)
!       {
!       std::string hname=headerBasename;
!       hname += ".";
!       hname += *ext;
!       // if it's already in the set, don't check if it exists on disk
!       std::set<std::string>::const_iterator headerIt=otherFiles.find(hname);
!       if (headerIt != otherFiles.end())
!         {
!         break;
!         }
! 
!       if(cmSystemTools::FileExists(hname.c_str()))
!         {
!         otherFiles.insert(hname);
!         break;
!         }
!       }
!     }
! 
!   // insert all source files in the CodeBlocks project
!   // first the C/C++ implementation files, then all others
!   for (std::map<std::string, cmSourceFile*>::const_iterator 
!        sit=cFiles.begin();
!        sit!=cFiles.end();
!        ++sit)
!     {
!     fout<<"      <Unit filename=\""<< sit->first <<"\">\n"
!           "      </Unit>\n";
!     }
!   for (std::set<std::string>::const_iterator 
!        sit=otherFiles.begin();
!        sit!=otherFiles.end();
         ++sit)
    {
!     fout<<"      <Unit filename=\""<< sit->c_str() <<"\">\n"
          "      </Unit>\n";
    }

Index: cmIncludeDirectoryCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmIncludeDirectoryCommand.cxx,v
retrieving revision 1.30
retrieving revision 1.30.2.1
diff -C 2 -d -r1.30 -r1.30.2.1
*** cmIncludeDirectoryCommand.cxx	8 Mar 2008 14:50:56 -0000	1.30
--- cmIncludeDirectoryCommand.cxx	27 Mar 2009 15:56:22 -0000	1.30.2.1
***************
*** 95,112 ****
  
    // remove any leading or trailing spaces and \r
!   pos = ret.size()-1;
!   while(ret[pos] == ' ' || ret[pos] == '\r')
!     {
!     ret.erase(pos);
!     pos--;
!     }
!   pos = 0;
!   while(ret.size() && ret[pos] == ' ' || ret[pos] == '\r')
      {
!     ret.erase(pos,1);
      }
!   if (!ret.size())
      {
!     return;
      }
    
--- 95,107 ----
  
    // remove any leading or trailing spaces and \r
!   std::string::size_type b = ret.find_first_not_of(" \r");
!   std::string::size_type e = ret.find_last_not_of(" \r");
!   if ((b!=ret.npos) && (e!=ret.npos))  
      {
!     ret.assign(ret, b, 1+e-b);   // copy the remaining substring
      }
!   else
      {
!     return;         // if we get here, we had only whitespace in the string
      }
    

Index: cmLocalVisualStudio6Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalVisualStudio6Generator.cxx,v
retrieving revision 1.141.2.4
retrieving revision 1.141.2.5
diff -C 2 -d -r1.141.2.4 -r1.141.2.5
*** cmLocalVisualStudio6Generator.cxx	13 Jan 2009 18:03:53 -0000	1.141.2.4
--- cmLocalVisualStudio6Generator.cxx	27 Mar 2009 15:56:36 -0000	1.141.2.5
***************
*** 1713,1721 ****
  
    // Now do the VS6-specific check.
!   if(define.find_first_of("=") != define.npos)
      {
      cmOStringStream e;
!     e << "WARNING: The VS6 IDE does not support preprocessor definitions "
!       << "with values.\n"
        << "CMake is dropping a preprocessor definition: " << define << "\n"
        << "Consider defining the macro in a (configured) header file.\n";
--- 1713,1721 ----
  
    // Now do the VS6-specific check.
!   if(define.find_first_of(" ") != define.npos)
      {
      cmOStringStream e;
!     e << "WARNING: The VS6 IDE does not support preprocessor definition "
!       << "values with spaces.\n"
        << "CMake is dropping a preprocessor definition: " << define << "\n"
        << "Consider defining the macro in a (configured) header file.\n";

Index: cmLocalUnixMakefileGenerator3.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalUnixMakefileGenerator3.cxx,v
retrieving revision 1.240.2.9
retrieving revision 1.240.2.10
diff -C 2 -d -r1.240.2.9 -r1.240.2.10
*** cmLocalUnixMakefileGenerator3.cxx	23 Mar 2009 17:58:48 -0000	1.240.2.9
--- cmLocalUnixMakefileGenerator3.cxx	27 Mar 2009 15:56:29 -0000	1.240.2.10
***************
*** 1968,1972 ****
    cmd += " ";
    
!   // Passg down verbosity level.
    if(this->GetMakeSilentFlag().size())
      {
--- 1968,1972 ----
    cmd += " ";
    
!   // Pass down verbosity level.
    if(this->GetMakeSilentFlag().size())
      {

Index: cmSourceFile.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmSourceFile.cxx,v
retrieving revision 1.47.2.5
retrieving revision 1.47.2.6
diff -C 2 -d -r1.47.2.5 -r1.47.2.6
*** cmSourceFile.cxx	23 Mar 2009 17:58:48 -0000	1.47.2.5
--- cmSourceFile.cxx	27 Mar 2009 15:56:47 -0000	1.47.2.6
***************
*** 406,410 ****
       "CMake will automatically drop some definitions that "
       "are not supported by the native build tool.  "
!      "The VS6 IDE does not support definitions with values "
       "(but NMake does).  Xcode does not support per-configuration "
       "definitions on source files.\n"
--- 406,410 ----
       "CMake will automatically drop some definitions that "
       "are not supported by the native build tool.  "
!      "The VS6 IDE does not support definition values with spaces "
       "(but NMake does).  Xcode does not support per-configuration "
       "definitions on source files.\n"

Index: cmGlobalUnixMakefileGenerator3.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalUnixMakefileGenerator3.h,v
retrieving revision 1.55.2.1
retrieving revision 1.55.2.2
diff -C 2 -d -r1.55.2.1 -r1.55.2.2
*** cmGlobalUnixMakefileGenerator3.h	13 Jun 2008 12:55:17 -0000	1.55.2.1
--- cmGlobalUnixMakefileGenerator3.h	27 Mar 2009 15:56:15 -0000	1.55.2.2
***************
*** 177,181 ****
    std::string EmptyRuleHackCommand;
  
-   std::map<cmStdString, int > TargetSourceFileCount;
    bool ForceVerboseMakefiles;
  };
--- 177,180 ----

Index: cmExtraEclipseCDT4Generator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmExtraEclipseCDT4Generator.h,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -C 2 -d -r1.4.2.1 -r1.4.2.2
*** cmExtraEclipseCDT4Generator.h	13 Jan 2009 18:03:52 -0000	1.4.2.1
--- cmExtraEclipseCDT4Generator.h	27 Mar 2009 15:56:06 -0000	1.4.2.2
***************
*** 112,115 ****
--- 112,119 ----
                                 const std::string&     altdefname);
  
+   static void AppendIncludeDirectories(cmGeneratedFileStream& fout,
+                                    const std::vector<std::string>& includeDirs,
+                                    std::set<std::string>& emittedDirs);
+ 
    std::vector<std::string> SrcLinkedResources;
    std::vector<std::string> OutLinkedResources;

Index: cmStringCommand.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmStringCommand.h,v
retrieving revision 1.28
retrieving revision 1.28.2.1
diff -C 2 -d -r1.28 -r1.28.2.1
*** cmStringCommand.h	23 Jan 2008 15:27:59 -0000	1.28
--- cmStringCommand.h	27 Mar 2009 15:56:47 -0000	1.28.2.1
***************
*** 133,139 ****
        "   ?         Matches preceding pattern zero or once only\n"
        "   |         Matches a pattern on either side of the |\n"
!       "   ()        Saves a matched subexpression, which can be referenced in "
!       "the REGEX REPLACE operation. Additionally it is saved in the special "
!       "CMake variables CMAKE_MATCH_(0..9).";
      }
    
--- 133,140 ----
        "   ?         Matches preceding pattern zero or once only\n"
        "   |         Matches a pattern on either side of the |\n"
!       "   ()        Saves a matched subexpression, which can be referenced \n"
!       "             in the REGEX REPLACE operation. Additionally it is saved\n"
!       "             by all regular expression-related commands, including \n"
!       "             e.g. if( MATCHES ), in the variables CMAKE_MATCH_(0..9).";
      }
    

Index: cmProjectCommand.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmProjectCommand.h,v
retrieving revision 1.16
retrieving revision 1.16.2.1
diff -C 2 -d -r1.16 -r1.16.2.1
*** cmProjectCommand.h	23 Jan 2008 15:27:59 -0000	1.16
--- cmProjectCommand.h	27 Mar 2009 15:56:45 -0000	1.16.2.1
***************
*** 65,76 ****
      {
      return
!       "  project(projectname [CXX] [C] [Java])\n"
        "Sets the name of the project.  "
!       "This creates the variables projectname_BINARY_DIR and "
!       "projectname_SOURCE_DIR.  "
        "Optionally you can specify which languages your project supports.  "
!       "By default all languages are supported.  If you do not have a "
!       "C++ compiler, but want" 
!       " to build a c program with cmake, then use this option.";
      }
    
--- 65,78 ----
      {
      return
!       "  project(<projectname> [languageName1 languageName2 ... ] )\n"
        "Sets the name of the project.  "
!       "Additionally this sets the variables <projectName>_BINARY_DIR and "
!       "<projectName>_SOURCE_DIR to the respective values.\n"
        "Optionally you can specify which languages your project supports.  "
!       "Example languages are CXX (i.e. C++), C, Fortran, etc. "
!       "By default C and CXX are enabled.  E.g. if you do not have a "
!       "C++ compiler, you can disable the check for it by explicitely listing "
!       "the languages you want to support, e.g. C.  By using the special "
!       "language \"NONE\" all checks for any language can be disabled.";
      }
    

Index: cmCommandArgumentParserHelper.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmCommandArgumentParserHelper.cxx,v
retrieving revision 1.20.4.1
retrieving revision 1.20.4.2
diff -C 2 -d -r1.20.4.1 -r1.20.4.2
*** cmCommandArgumentParserHelper.cxx	1 Jan 2009 17:49:41 -0000	1.20.4.1
--- cmCommandArgumentParserHelper.cxx	27 Mar 2009 15:55:57 -0000	1.20.4.2
***************
*** 116,124 ****
      return 0;
      }
!   if(this->FileName && strcmp(var, "CMAKE_CURRENT_LIST_FILE") == 0)
!     {
!     return this->AddString(this->FileName);
!     }
!   else if(this->FileLine >= 0 && strcmp(var, "CMAKE_CURRENT_LIST_LINE") == 0)
      {
      cmOStringStream ostr;
--- 116,120 ----
      return 0;
      }
!   if(this->FileLine >= 0 && strcmp(var, "CMAKE_CURRENT_LIST_LINE") == 0)
      {
      cmOStringStream ostr;

Index: cmExtraEclipseCDT4Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmExtraEclipseCDT4Generator.cxx,v
retrieving revision 1.13.2.4
retrieving revision 1.13.2.5
diff -C 2 -d -r1.13.2.4 -r1.13.2.5
*** cmExtraEclipseCDT4Generator.cxx	15 Jan 2009 14:17:20 -0000	1.13.2.4
--- cmExtraEclipseCDT4Generator.cxx	27 Mar 2009 15:56:01 -0000	1.13.2.5
***************
*** 96,100 ****
      = static_cast<cmGlobalUnixMakefileGenerator3*>(generator);
    mf->SetToolSupportsColor(true);
-   mf->SetForceVerboseMakefiles(true);
  }
  
--- 96,99 ----
***************
*** 252,255 ****
--- 251,255 ----
      "\t\t\t\t<dictionary>\n"
      "\t\t\t\t\t<key>org.eclipse.cdt.make.core.environment</key>\n"
+     "\t\t\t\t\t<value>VERBOSE=1|</value>\n"  // enforce VERBOSE Makefile output
      "\t\t\t\t\t<value>"
      ;
***************
*** 396,399 ****
--- 396,423 ----
  
  //----------------------------------------------------------------------------
+ void cmExtraEclipseCDT4Generator::AppendIncludeDirectories(
+                             cmGeneratedFileStream& fout,
+                             const std::vector<std::string>& includeDirs,
+                             std::set<std::string>& emittedDirs)
+ {
+   for(std::vector<std::string>::const_iterator inc = includeDirs.begin();
+       inc != includeDirs.end();
+       ++inc)
+     {
+     if (!inc->empty())
+       {
+       std::string dir = cmSystemTools::CollapseFullPath(inc->c_str());
+       if(emittedDirs.find(dir) == emittedDirs.end())
+         {
+         emittedDirs.insert(dir);
+         fout << "<pathentry include=\"" 
+              << cmExtraEclipseCDT4Generator::GetEclipsePath(dir)
+              << "\" kind=\"inc\" path=\"\" system=\"true\"/>\n";
+         }
+       }
+     }
+ }
+ 
+ //----------------------------------------------------------------------------
  void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
  {
***************
*** 591,606 ****
      const std::vector<std::string>& includeDirs
        = (*it)->GetMakefile()->GetIncludeDirectories();
!     for(std::vector<std::string>::const_iterator inc = includeDirs.begin();
!         inc != includeDirs.end();
!         ++inc)
!       {
!       std::string dir = cmSystemTools::CollapseFullPath(inc->c_str());
!       if(emmited.find(dir) == emmited.end())
!         {
!         emmited.insert(dir);
!         fout << "<pathentry include=\"" << this->GetEclipsePath(dir)
!              << "\" kind=\"inc\" path=\"\" system=\"true\"/>\n";
!         }
        }
      }
    fout << "</storageModule>\n";
--- 615,641 ----
      const std::vector<std::string>& includeDirs
        = (*it)->GetMakefile()->GetIncludeDirectories();
!     this->AppendIncludeDirectories(fout, includeDirs, emmited);
        }
+   // now also the system include directories, in case we found them in 
+   // CMakeSystemSpecificInformation.cmake. This makes Eclipse find the 
+   // standard headers.
+   mf->GetDefinition("CMAKE_ECLIPSE_C_SYSTEM_INCLUDE_DIRS");
+   std::string compiler = mf->GetSafeDefinition("CMAKE_C_COMPILER");
+   if (!compiler.empty())
+     {
+     std::string systemIncludeDirs = mf->GetSafeDefinition(
+                                       "CMAKE_ECLIPSE_C_SYSTEM_INCLUDE_DIRS");
+     std::vector<std::string> dirs;
+     cmSystemTools::ExpandListArgument(systemIncludeDirs.c_str(), dirs);
+     this->AppendIncludeDirectories(fout, dirs, emmited);
+     }
+   compiler = mf->GetSafeDefinition("CMAKE_CXX_COMPILER");
+   if (!compiler.empty())
+     {
+     std::string systemIncludeDirs = mf->GetSafeDefinition(
+                                       "CMAKE_ECLIPSE_CXX_SYSTEM_INCLUDE_DIRS");
+     std::vector<std::string> dirs;
+     cmSystemTools::ExpandListArgument(systemIncludeDirs.c_str(), dirs);
+     this->AppendIncludeDirectories(fout, dirs, emmited);
      }
    fout << "</storageModule>\n";

Index: cmTarget.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmTarget.cxx,v
retrieving revision 1.207.2.14
retrieving revision 1.207.2.15
diff -C 2 -d -r1.207.2.14 -r1.207.2.15
*** cmTarget.cxx	23 Mar 2009 17:58:48 -0000	1.207.2.14
--- cmTarget.cxx	27 Mar 2009 15:56:47 -0000	1.207.2.15
***************
*** 109,113 ****
       "CMake will automatically drop some definitions that "
       "are not supported by the native build tool.  "
!      "The VS6 IDE does not support definitions with values "
       "(but NMake does).\n"
       "Dislaimer: Most native build tools have poor support for escaping "
--- 109,113 ----
       "CMake will automatically drop some definitions that "
       "are not supported by the native build tool.  "
!      "The VS6 IDE does not support definition values with spaces "
       "(but NMake does).\n"
       "Dislaimer: Most native build tools have poor support for escaping "

Index: cmMakefile.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefile.cxx,v
retrieving revision 1.463.2.13
retrieving revision 1.463.2.14
diff -C 2 -d -r1.463.2.13 -r1.463.2.14
*** cmMakefile.cxx	23 Mar 2009 17:58:48 -0000	1.463.2.13
--- cmMakefile.cxx	27 Mar 2009 15:56:41 -0000	1.463.2.14
***************
*** 1209,1216 ****
      }
  
!   // VS6 IDE does not support definitions with values.
    if((strcmp(this->LocalGenerator->GetGlobalGenerator()->GetName(),
               "Visual Studio 6") == 0) &&
!      (def.find("=") != def.npos))
      {
      return false;
--- 1209,1216 ----
      }
  
!   // VS6 IDE does not support definition values with spaces.
    if((strcmp(this->LocalGenerator->GetGlobalGenerator()->GetName(),
               "Visual Studio 6") == 0) &&
!      (def.find(" ") != def.npos))
      {
      return false;
***************
*** 3476,3480 ****
       "CMake will automatically drop some definitions that "
       "are not supported by the native build tool.  "
!      "The VS6 IDE does not support definitions with values "
       "(but NMake does).\n"
       "Dislaimer: Most native build tools have poor support for escaping "
--- 3476,3480 ----
       "CMake will automatically drop some definitions that "
       "are not supported by the native build tool.  "
!      "The VS6 IDE does not support definition values with spaces "
       "(but NMake does).\n"
       "Dislaimer: Most native build tools have poor support for escaping "



More information about the Cmake-commits mailing list