summaryrefslogtreecommitdiffstats
path: root/Source/cmake.cxx
diff options
context:
space:
mode:
authorKen Martin <ken.martin@kitware.com>2006-05-23 13:11:46 (GMT)
committerKen Martin <ken.martin@kitware.com>2006-05-23 13:11:46 (GMT)
commit50d058a3a1ed4fbb1a1df29ae9979d8c9812ceef (patch)
tree980f4a317110d0903d24e45486a840790833972f /Source/cmake.cxx
parent4a2d72d313a0ee9463a6baac7a10ed6610159e38 (diff)
downloadCMake-50d058a3a1ed4fbb1a1df29ae9979d8c9812ceef.zip
CMake-50d058a3a1ed4fbb1a1df29ae9979d8c9812ceef.tar.gz
CMake-50d058a3a1ed4fbb1a1df29ae9979d8c9812ceef.tar.bz2
ENH: always compile progress
Diffstat (limited to 'Source/cmake.cxx')
-rw-r--r--Source/cmake.cxx7
1 files changed, 2 insertions, 5 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index a4e5640..ca9f1c3 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -29,9 +29,10 @@
# include "cmVariableWatch.h"
# include "cmVersion.h"
# include <cmsys/Terminal.h>
-# include <cmsys/Directory.hxx>
#endif
+# include <cmsys/Directory.hxx>
+
// only build kdevelop generator on non-windows platforms
// when not bootstrapping cmake
#if !defined(_WIN32)
@@ -977,7 +978,6 @@ int cmake::ExecuteCMakeCommand(std::vector<std::string>& args)
// Command to start progress for a build
else if (args[1] == "cmake_progress_start" && args.size() == 4)
{
-#if defined(CMAKE_BUILD_WITH_CMAKE)
// bascially remove the directory
std::string dirName = args[2];
dirName += "/Progress";
@@ -993,14 +993,12 @@ int cmake::ExecuteCMakeCommand(std::vector<std::string>& args)
fprintf(progFile,"%i\n",count);
fclose(progFile);
}
-#endif
return 0;
}
// Command to report progress for a build
else if (args[1] == "cmake_progress_report" && args.size() >= 4)
{
-#if defined(CMAKE_BUILD_WITH_CMAKE)
std::string dirName = args[2];
dirName += "/Progress";
std::string fName;
@@ -1036,7 +1034,6 @@ int cmake::ExecuteCMakeCommand(std::vector<std::string>& args)
}
fclose(progFile);
}
-#endif
return 0;
}