diff options
| author | Brad King <brad.king@kitware.com> | 2015-02-05 21:29:59 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-02-05 21:44:56 (GMT) |
| commit | 69ac6d27555cd4819d0c7f40e4471c6f885e23ab (patch) | |
| tree | 6d63228342fb1633fc0352f732d34d7b8f32da65 /Source/cmSystemTools.cxx | |
| parent | 098160d5f2a1aa35d2f14c585dd87cefd8f56f41 (diff) | |
| download | CMake-69ac6d27555cd4819d0c7f40e4471c6f885e23ab.zip CMake-69ac6d27555cd4819d0c7f40e4471c6f885e23ab.tar.gz CMake-69ac6d27555cd4819d0c7f40e4471c6f885e23ab.tar.bz2 | |
bootstrap: Enable color Makefile output
Build the needed infrastructure during bootstrap in order to allow
"cmake -E cmake_echo_color" to be used unconditionally during
generation.
Diffstat (limited to 'Source/cmSystemTools.cxx')
| -rw-r--r-- | Source/cmSystemTools.cxx | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index e9735ed..ec3d846 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -27,10 +27,10 @@ #if defined(CMAKE_BUILD_WITH_CMAKE) # include "cmArchiveWrite.h" # include <cm_libarchive.h> -# include <cmsys/Terminal.h> #endif #include <cmsys/stl/algorithm> #include <cmsys/FStream.hxx> +#include <cmsys/Terminal.h> #if defined(_WIN32) # include <windows.h> @@ -2284,7 +2284,6 @@ std::string const& cmSystemTools::GetCMakeRoot() } //---------------------------------------------------------------------------- -#if defined(CMAKE_BUILD_WITH_CMAKE) void cmSystemTools::MakefileColorEcho(int color, const char* message, bool newline, bool enabled) { @@ -2314,7 +2313,6 @@ void cmSystemTools::MakefileColorEcho(int color, const char* message, fprintf(stdout, "%s%s", message, newline? "\n" : ""); } } -#endif //---------------------------------------------------------------------------- bool cmSystemTools::GuessLibrarySOName(std::string const& fullPath, |