[Cmake-commits] [cmake-commits] king committed cmLocalGenerator.cxx 1.292 1.293 cmLocalGenerator.h 1.110 1.111 cmLocalUnixMakefileGenerator3.cxx 1.261 1.262

[cmake-commits at cmake.org]

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

Modified Files:
	cmLocalGenerator.cxx cmLocalGenerator.h 
	cmLocalUnixMakefileGenerator3.cxx 
Log Message:
BUG: Remove implicit include dir suppression

We used to suppress generation of -I/usr/include (and on OSX also
-I/usr/local/include).  This behavior seems to cause more trouble than
it's worth, so I'm removing it until someone encounters the original
problem it fixed.  See issue #8598.


Index: cmLocalGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalGenerator.cxx,v
retrieving revision 1.292
retrieving revision 1.293
diff -C 2 -d -r1.292 -r1.293
*** cmLocalGenerator.cxx	10 Feb 2009 13:52:06 -0000	1.292
--- cmLocalGenerator.cxx	24 Feb 2009 20:37:08 -0000	1.293
***************
*** 1294,1299 ****
  
  //----------------------------------------------------------------------------
! void cmLocalGenerator::GetIncludeDirectories(std::vector<std::string>& dirs,
!                                              bool filter_system_dirs)
  {
    // Need to decide whether to automatically include the source and
--- 1294,1298 ----
  
  //----------------------------------------------------------------------------
! void cmLocalGenerator::GetIncludeDirectories(std::vector<std::string>& dirs)
  {
    // Need to decide whether to automatically include the source and
***************
*** 1361,1382 ****
      }
  
-   if(filter_system_dirs)
-     {
-     // Do not explicitly add the standard include path "/usr/include".
-     // This can cause problems with certain standard library
-     // implementations because the wrong headers may be found first.
-     emitted.insert("/usr/include");
-     if(const char* implicitIncludes = this->Makefile->GetDefinition
-        ("CMAKE_PLATFORM_IMPLICIT_INCLUDE_DIRECTORIES"))
-       {
-       std::vector<std::string> implicitIncludeVec;
-       cmSystemTools::ExpandListArgument(implicitIncludes, implicitIncludeVec);
-       for(unsigned int k = 0; k < implicitIncludeVec.size(); ++k)
-         {
-         emitted.insert(implicitIncludeVec[k]);
-         }
-       }
-     }
- 
    // Get the project-specified include directories.
    std::vector<std::string>& includes = 
--- 1360,1363 ----

Index: cmLocalGenerator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalGenerator.h,v
retrieving revision 1.110
retrieving revision 1.111
diff -C 2 -d -r1.110 -r1.111
*** cmLocalGenerator.h	10 Feb 2009 13:52:06 -0000	1.110
--- cmLocalGenerator.h	24 Feb 2009 20:37:09 -0000	1.111
***************
*** 190,195 ****
  
    /** Get the include flags for the current makefile and language.  */
!   void GetIncludeDirectories(std::vector<std::string>& dirs,
!                              bool filter_system_dirs = true);
  
    /** Compute the language used to compile the given source file.  */
--- 190,194 ----
  
    /** Get the include flags for the current makefile and language.  */
!   void GetIncludeDirectories(std::vector<std::string>& dirs);
  
    /** Compute the language used to compile the given source file.  */

Index: cmLocalUnixMakefileGenerator3.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalUnixMakefileGenerator3.cxx,v
retrieving revision 1.261
retrieving revision 1.262
diff -C 2 -d -r1.261 -r1.262
*** cmLocalUnixMakefileGenerator3.cxx	10 Feb 2009 13:52:07 -0000	1.261
--- cmLocalUnixMakefileGenerator3.cxx	24 Feb 2009 20:37:09 -0000	1.262
***************
*** 501,505 ****
      << "SET(CMAKE_C_INCLUDE_PATH\n";
    std::vector<std::string> includeDirs;
!   this->GetIncludeDirectories(includeDirs, false);
    for(std::vector<std::string>::iterator i = includeDirs.begin();
        i != includeDirs.end(); ++i)
--- 501,505 ----
      << "SET(CMAKE_C_INCLUDE_PATH\n";
    std::vector<std::string> includeDirs;
!   this->GetIncludeDirectories(includeDirs);
    for(std::vector<std::string>::iterator i = includeDirs.begin();
        i != includeDirs.end(); ++i)