[Cmake-commits] [cmake-commits] king committed cmMakefile.cxx 1.526 1.527

[cmake-commits at cmake.org]

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

Modified Files:
	cmMakefile.cxx 
Log Message:
Do not collapse path of NOTFOUND values

In cmMakefile::AddCacheDefinition we collapse paths specified in PATH or
FILEPATH cache entries originally specified on the command line with
UNINITALIZED type.  This commit fixes the logic to avoid collapsing
<var>-NOTFOUND and other false values.  The change allows other CMake
code to force a NOTFOUND value on an entry with UNINITALIZED type.


Index: cmMakefile.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefile.cxx,v
retrieving revision 1.526
retrieving revision 1.527
diff -C 2 -d -r1.526 -r1.527
*** cmMakefile.cxx	5 Oct 2009 13:06:27 -0000	1.526
--- cmMakefile.cxx	7 Oct 2009 18:37:19 -0000	1.527
***************
*** 1720,1724 ****
        for ( cc = 0; cc < files.size(); cc ++ )
          {
!         files[cc] = cmSystemTools::CollapseFullPath(files[cc].c_str());
          if ( cc > 0 )
            {
--- 1720,1727 ----
        for ( cc = 0; cc < files.size(); cc ++ )
          {
!         if(!cmSystemTools::IsOff(files[cc].c_str()))
!           {
!           files[cc] = cmSystemTools::CollapseFullPath(files[cc].c_str());
!           }
          if ( cc > 0 )
            {