[cmake-commits] alex committed cmSystemTools.cxx 1.340 1.341
cmake-commits at cmake.org
cmake-commits at cmake.org
Mon Jul 16 15:10:43 EDT 2007
Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv32175
Modified Files:
cmSystemTools.cxx
Log Message:
BUG: fix bootstrapping, md5sum disabled in bootstrapping mode
Alex
Index: cmSystemTools.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmSystemTools.cxx,v
retrieving revision 1.340
retrieving revision 1.341
diff -u -d -r1.340 -r1.341
--- cmSystemTools.cxx 16 Jul 2007 14:54:32 -0000 1.340
+++ cmSystemTools.cxx 16 Jul 2007 19:10:40 -0000 1.341
@@ -22,7 +22,6 @@
#include <cmsys/RegularExpression.hxx>
#include <cmsys/Directory.hxx>
#include <cmsys/System.h>
-#include <cmsys/MD5.h>
// support for realpath call
#ifndef _WIN32
@@ -51,6 +50,7 @@
# include <memory> // auto_ptr
# include <fcntl.h>
# include <cm_zlib.h>
+# include <cmsys/MD5.h>
#endif
#if defined(__sgi) && !defined(__GNUC__)
@@ -1049,6 +1049,7 @@
bool cmSystemTools::ComputeFileMD5(const char* source, char* md5out)
{
+#if defined(CMAKE_BUILD_WITH_CMAKE)
if(!cmSystemTools::FileExists(source))
{
return false;
@@ -1089,8 +1090,11 @@
cmsysMD5_Delete(md5);
fin.close();
-
return true;
+#else
+ cmSystemTools::Message("md5sum not supported in bootstrapping mode","Error");
+ return false;
+#endif
}
void cmSystemTools::Glob(const char *directory, const char *regexp,
More information about the Cmake-commits
mailing list