[Cmake-commits] [cmake-commits] alex committed cmGlobalUnixMakefileGenerator3.cxx 1.132 1.133

[cmake-commits at cmake.org]

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

Modified Files:
	cmGlobalUnixMakefileGenerator3.cxx 
Log Message:
BUG: don't report changed compiler variables if the path to the compiler
differs only e.g. a double slash somewhere instead only one slash as
directory separator (#8890)

Alex


Index: cmGlobalUnixMakefileGenerator3.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalUnixMakefileGenerator3.cxx,v
retrieving revision 1.132
retrieving revision 1.133
diff -C 2 -d -r1.132 -r1.133
*** cmGlobalUnixMakefileGenerator3.cxx	6 Feb 2009 16:18:56 -0000	1.132
--- cmGlobalUnixMakefileGenerator3.cxx	10 May 2009 09:29:10 -0000	1.133
***************
*** 96,113 ****
      if(cname && (path != cname) && (optional==false))
        {
!       const char* cvars = 
!         this->GetCMakeInstance()->GetProperty(
!           "__CMAKE_DELETE_CACHE_CHANGE_VARS_");
!       if(cvars)
!         {
!         changeVars += cvars;
          changeVars += ";";
          }
-       changeVars += langComp;
-       changeVars += ";";
-       changeVars += cname;
-       this->GetCMakeInstance()->SetProperty(
-         "__CMAKE_DELETE_CACHE_CHANGE_VARS_",
-         changeVars.c_str());
        }
      mf->AddCacheDefinition(langComp.c_str(), path.c_str(),
--- 96,121 ----
      if(cname && (path != cname) && (optional==false))
        {
!       std::string cnameString = cname;
!       std::string pathString = path;
!       // get rid of potentially multiple slashes:
!       cmSystemTools::ConvertToUnixSlashes(cnameString);
!       cmSystemTools::ConvertToUnixSlashes(pathString);
!       if (cnameString != pathString)
!         { 
!         const char* cvars = 
!           this->GetCMakeInstance()->GetProperty(
!             "__CMAKE_DELETE_CACHE_CHANGE_VARS_");
!         if(cvars)
!           {
!           changeVars += cvars;
!           changeVars += ";";
!           }
!         changeVars += langComp;
          changeVars += ";";
+         changeVars += cname;
+         this->GetCMakeInstance()->SetProperty(
+           "__CMAKE_DELETE_CACHE_CHANGE_VARS_",
+           changeVars.c_str());
          }
        }
      mf->AddCacheDefinition(langComp.c_str(), path.c_str(),