[cmake-commits] alex committed cmFindPackageCommand.cxx 1.23 1.24

[cmake-commits at cmake.org]

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

Modified Files:
	cmFindPackageCommand.cxx 
Log Message:

ENH: also process "~" and paths relative to CMAKE_CURRENT_SOURCE_DIR in Foo_DIR 

Alex


Index: cmFindPackageCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmFindPackageCommand.cxx,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- cmFindPackageCommand.cxx	8 Aug 2007 17:05:27 -0000	1.23
+++ cmFindPackageCommand.cxx	20 Aug 2007 12:49:21 -0000	1.24
@@ -186,8 +186,15 @@
   if(!cmSystemTools::IsOff(def))
     {
     std::string f = def;
+    cmSystemTools::ConvertToUnixSlashes(f);
     f += "/";
     f += this->Config;
+    if(!cmSystemTools::FileIsFullPath(f.c_str()))
+      {
+      f = "/" + f;
+      f = this->Makefile->GetCurrentDirectory() + f;
+      }
+    
     if(cmSystemTools::FileExists(f.c_str()))
       {
       if(this->ReadListFile(f.c_str()))