[Cmake-commits] [cmake-commits] king committed cmSourceFile.cxx 1.48 1.49

cmake-commits at cmake.org cmake-commits at cmake.org
Fri Apr 25 15:31:00 EDT 2008


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

Modified Files:
	cmSourceFile.cxx 
Log Message:
BUG: Trust user-provided source file full paths.


Index: cmSourceFile.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmSourceFile.cxx,v
retrieving revision 1.48
retrieving revision 1.49
diff -C 2 -d -r1.48 -r1.49
*** cmSourceFile.cxx	1 Apr 2008 18:22:07 -0000	1.48
--- cmSourceFile.cxx	25 Apr 2008 19:30:58 -0000	1.49
***************
*** 168,171 ****
--- 168,181 ----
      }
  
+   // If the user provided a full path, trust it.  If the file is not
+   // there the native tool will complain at build time.
+   if(!this->Location.DirectoryIsAmbiguous())
+     {
+     this->FullPath = this->Location.GetDirectory();
+     this->FullPath += "/";
+     this->FullPath += this->Location.GetName();
+     return true;
+     }
+ 
    cmOStringStream e;
    e << "Cannot find source file \"" << this->Location.GetName() << "\"";



More information about the Cmake-commits mailing list