[cmake-commits] hoffman committed cmAuxSourceDirectoryCommand.cxx 1.24 1.25

cmake-commits at cmake.org cmake-commits at cmake.org
Wed Jan 2 11:08:06 EST 2008


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

Modified Files:
	cmAuxSourceDirectoryCommand.cxx 
Log Message:
BUG: fix for bug 6197, absolute paths were not supported


Index: cmAuxSourceDirectoryCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmAuxSourceDirectoryCommand.cxx,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- cmAuxSourceDirectoryCommand.cxx	18 Jun 2007 15:59:23 -0000	1.24
+++ cmAuxSourceDirectoryCommand.cxx	2 Jan 2008 16:08:02 -0000	1.25
@@ -32,9 +32,17 @@
   std::string sourceListValue;
   std::string templateDirectory = args[0];
   this->Makefile->AddExtraDirectory(templateDirectory.c_str());
-  std::string tdir = this->Makefile->GetCurrentDirectory();
-  tdir += "/";
-  tdir += templateDirectory;
+  std::string tdir;
+  if(!cmSystemTools::FileExists(templateDirectory.c_str()))
+    {
+    tdir = this->Makefile->GetCurrentDirectory();
+    tdir += "/";
+    tdir += templateDirectory;
+    }
+  else
+    {
+    tdir = templateDirectory;
+    }
 
   // was the list already populated
   const char *def = this->Makefile->GetDefinition(args[1].c_str());  



More information about the Cmake-commits mailing list