[cmake-commits] king committed cmake.cxx 1.354 1.355

[cmake-commits at cmake.org]

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

Modified Files:
	cmake.cxx 
Log Message:
BUG: Make cmake -E remove_directory work when directory is not present.


Index: cmake.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmake.cxx,v
retrieving revision 1.354
retrieving revision 1.355
diff -u -d -r1.354 -r1.355
--- cmake.cxx	20 Jan 2008 18:36:13 -0000	1.354
+++ cmake.cxx	24 Jan 2008 19:37:48 -0000	1.355
@@ -1027,7 +1027,8 @@
 
     else if (args[1] == "remove_directory" && args.size() == 3)
       {
-      if(!cmSystemTools::RemoveADirectory(args[2].c_str()))
+      if(cmSystemTools::FileIsDirectory(args[2].c_str()) &&
+         !cmSystemTools::RemoveADirectory(args[2].c_str()))
         {
         std::cerr << "Error removing directory \"" << args[2].c_str()
                   << "\".\n";