From 4aeb3af55ff8ab7c1954fac444b24284f306604a Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 16 Aug 2022 22:52:48 +0800 Subject: ignore color codes --- xmake/plugins/project/cmake/cmakelists.lua | 3 ++- xmake/plugins/project/vstudio/impl/vs201x.lua | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/xmake/plugins/project/cmake/cmakelists.lua b/xmake/plugins/project/cmake/cmakelists.lua index 130c1ad38..5154956e6 100644 --- a/xmake/plugins/project/cmake/cmakelists.lua +++ b/xmake/plugins/project/cmake/cmakelists.lua @@ -19,6 +19,7 @@ -- -- imports +import("core.base.colors") import("core.project.project") import("core.project.config") import("core.tool.compiler") @@ -828,7 +829,7 @@ function _get_command_string(cmd, outputdir) elseif kind == "mkdir" then return string.format("${CMAKE_COMMAND} -E make_directory %s", _get_unix_path_relative_to_cmake(cmd.dir, outputdir)) elseif kind == "show" then - return string.format("echo %s", cmd.showtext) + return string.format("echo %s", colors.ignore(cmd.showtext)) end end diff --git a/xmake/plugins/project/vstudio/impl/vs201x.lua b/xmake/plugins/project/vstudio/impl/vs201x.lua index ce843d725..6fcb5a3a8 100644 --- a/xmake/plugins/project/vstudio/impl/vs201x.lua +++ b/xmake/plugins/project/vstudio/impl/vs201x.lua @@ -20,6 +20,7 @@ -- imports import("core.base.option") +import("core.base.colors") import("core.project.rule") import("core.project.config") import("core.project.project") @@ -109,7 +110,7 @@ function _get_command_string(cmd, vcxprojdir) local dir = _translate_path(cmd.dir, vcxprojdir) return string.format("if not exist \"%s\" mkdir \"%s\"", dir, dir) elseif kind == "show" then - return string.format("echo %s", cmd.showtext) + return string.format("echo %s", colors.ignore(cmd.showtext)) end end -- cgit v1.3.1