diff options
| author | Brad King <brad.king@kitware.com> | 2006-04-27 01:53:21 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2006-04-27 01:53:21 (GMT) |
| commit | a3cd7fd1b55e88da5a596ca88e9f7b0f90155087 (patch) | |
| tree | 228791db80b410bd8404c1965021dd52a6c18d42 /Source/cmake.cxx | |
| parent | a4f9d6a80b61018a33d564c9403304e7f400fc00 (diff) | |
| download | CMake-a3cd7fd1b55e88da5a596ca88e9f7b0f90155087.zip CMake-a3cd7fd1b55e88da5a596ca88e9f7b0f90155087.tar.gz CMake-a3cd7fd1b55e88da5a596ca88e9f7b0f90155087.tar.bz2 | |
COMP: Disable color support for bootstrap.
Diffstat (limited to 'Source/cmake.cxx')
| -rw-r--r-- | Source/cmake.cxx | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx index a67ab15..cc55aa4 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -24,12 +24,11 @@ #include "cmFileTimeComparison.h" #include "cmGeneratedFileStream.h" -#include <cmsys/Terminal.h> - #if defined(CMAKE_BUILD_WITH_CMAKE) # include "cmDependsFortran.h" // For -E cmake_copy_f90_mod callback. # include "cmVariableWatch.h" # include "cmVersion.h" +# include <cmsys/Terminal.h> #endif // only build kdevelop generator on non-windows platforms @@ -1007,11 +1006,13 @@ int cmake::ExecuteCMakeCommand(std::vector<std::string>& args) return 1; } +#ifdef CMAKE_BUILD_WITH_CMAKE // Internal CMake color makefile support. - else if (args[1] == "cmake_echo_color" ) + else if (args[1] == "cmake_echo_color") { return cmake::ExecuteEchoColor(args); } +#endif // Tar files else if (args[1] == "tar" && args.size() > 3) @@ -2353,6 +2354,7 @@ void cmake::GenerateGraphViz(const char* fileName) } //---------------------------------------------------------------------------- +#ifdef CMAKE_BUILD_WITH_CMAKE int cmake::ExecuteEchoColor(std::vector<std::string>& args) { // The arguments are @@ -2457,3 +2459,9 @@ int cmake::ExecuteEchoColor(std::vector<std::string>& args) return 0; } +#else +int cmake::ExecuteEchoColor(std::vector<std::string>&) +{ + return 1; +} +#endif |