kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

COMP: Disable color support for bootstrap.

This commit is contained in:
Brad King 2006-04-26 21:53:21 -04:00
parent a4f9d6a80b
commit a3cd7fd1b5
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmLocalUnixMakefileGenerator3.cxx
View File

@ -856,6 +856,7 @@ cmLocalUnixMakefileGenerator3::AppendEcho(std::vector<std::string>& commands,
{ {
// Choose the color for the text. // Choose the color for the text.
std::string color_name; std::string color_name;
#ifdef CMAKE_BUILD_WITH_CMAKE
if(this->GlobalGenerator->GetToolSupportsColor() && if(this->GlobalGenerator->GetToolSupportsColor() &&
this->Makefile->IsOn("CMAKE_COLOR_MAKEFILE")) this->Makefile->IsOn("CMAKE_COLOR_MAKEFILE"))
{ {
@ -882,6 +883,7 @@ cmLocalUnixMakefileGenerator3::AppendEcho(std::vector<std::string>& commands,
break; break;
} }
} }
#endif
// Echo one line at a time. // Echo one line at a time.
std::string line; std::string line;

12
Source/cmake.cxx
View File

@ -24,12 +24,11 @@
#include "cmFileTimeComparison.h" #include "cmFileTimeComparison.h"
#include "cmGeneratedFileStream.h" #include "cmGeneratedFileStream.h"
#include <cmsys/Terminal.h>
#if defined(CMAKE_BUILD_WITH_CMAKE) #if defined(CMAKE_BUILD_WITH_CMAKE)
# include "cmDependsFortran.h" // For -E cmake_copy_f90_mod callback. # include "cmDependsFortran.h" // For -E cmake_copy_f90_mod callback.
# include "cmVariableWatch.h" # include "cmVariableWatch.h"
# include "cmVersion.h" # include "cmVersion.h"
# include <cmsys/Terminal.h>
#endif #endif
// only build kdevelop generator on non-windows platforms // only build kdevelop generator on non-windows platforms
@ -1007,11 +1006,13 @@ int cmake::ExecuteCMakeCommand(std::vector<std::string>& args)
return 1; return 1;
} }
#ifdef CMAKE_BUILD_WITH_CMAKE
// Internal CMake color makefile support. // Internal CMake color makefile support.
else if (args[1] == "cmake_echo_color") else if (args[1] == "cmake_echo_color")
{ {
return cmake::ExecuteEchoColor(args); return cmake::ExecuteEchoColor(args);
} }
#endif
// Tar files // Tar files
else if (args[1] == "tar" && args.size() > 3) 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) int cmake::ExecuteEchoColor(std::vector<std::string>& args)
{ {
// The arguments are // The arguments are
@ -2457,3 +2459,9 @@ int cmake::ExecuteEchoColor(std::vector<std::string>& args)
return 0; return 0;
} }
#else
int cmake::ExecuteEchoColor(std::vector<std::string>&)
{
return 1;
}
#endif