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/cmcmd.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/cmcmd.cxx')
| -rw-r--r-- | Source/cmcmd.cxx | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx index 28fcd27..6b04d26 100644 --- a/Source/cmcmd.cxx +++ b/Source/cmcmd.cxx @@ -18,12 +18,12 @@ #if defined(CMAKE_BUILD_WITH_CMAKE) # include "cmDependsFortran.h" // For -E cmake_copy_f90_mod callback. -# include <cmsys/Terminal.h> #endif #include <cmsys/Directory.hxx> #include <cmsys/Process.h> #include <cmsys/FStream.hxx> +#include <cmsys/Terminal.h> #if defined(CMAKE_HAVE_VS_GENERATORS) #include "cmCallVisualStudioMacro.h" @@ -753,12 +753,12 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args) { return cmcmd::VisualStudioLink(args, 2); } -#ifdef CMAKE_BUILD_WITH_CMAKE // Internal CMake color makefile support. else if (args[1] == "cmake_echo_color") { return cmcmd::ExecuteEchoColor(args); } +#ifdef CMAKE_BUILD_WITH_CMAKE else if (args[1] == "cmake_autogen" && args.size() >= 4) { cmQtAutoGenerators autogen; @@ -987,7 +987,6 @@ bool cmcmd::SymlinkInternal(std::string const& file, std::string const& link) } //---------------------------------------------------------------------------- -#ifdef CMAKE_BUILD_WITH_CMAKE int cmcmd::ExecuteEchoColor(std::vector<std::string>& args) { // The arguments are @@ -1073,12 +1072,6 @@ int cmcmd::ExecuteEchoColor(std::vector<std::string>& args) return 0; } -#else -int cmcmd::ExecuteEchoColor(std::vector<std::string>&) -{ - return 1; -} -#endif //---------------------------------------------------------------------------- int cmcmd::ExecuteLinkScript(std::vector<std::string>& args) |