summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--xmake/modules/core/project/depend.lua2
-rw-r--r--xmake/rules/protobuf/xmake.lua5
2 files changed, 3 insertions, 4 deletions
diff --git a/xmake/modules/core/project/depend.lua b/xmake/modules/core/project/depend.lua
index ca05dc2f4..1369796bb 100644
--- a/xmake/modules/core/project/depend.lua
+++ b/xmake/modules/core/project/depend.lua
@@ -70,7 +70,7 @@ end
-- show diagnosis info?
function _is_show_diagnosis_info()
- local show = _g.is_show_diagnosis_info
+ local show = true-- _g.is_show_diagnosis_info
if show == nil then
if project.policy("diagnosis.check_build_deps") then
show = true
diff --git a/xmake/rules/protobuf/xmake.lua b/xmake/rules/protobuf/xmake.lua
index a3e6d6732..6aa60d53c 100644
--- a/xmake/rules/protobuf/xmake.lua
+++ b/xmake/rules/protobuf/xmake.lua
@@ -25,8 +25,7 @@ rule("protobuf.cpp")
after_load(function(target)
import("proto").load(target, "cxx")
end)
- -- generate build commands
- before_buildcmd_file(function(target, batchcmds, sourcefile_proto, opt)
+ on_preparecmd_file(function(target, batchcmds, sourcefile_proto, opt)
import("proto").buildcmd_pfile(target, batchcmds, sourcefile_proto, "cxx", opt)
end)
on_buildcmd_file(function(target, batchcmds, sourcefile_proto, opt)
@@ -41,7 +40,7 @@ rule("protobuf.c")
after_load(function(target)
import("proto").load(target, "cc")
end)
- before_buildcmd_file(function(target, batchcmds, sourcefile_proto, opt)
+ on_preparecmd_file(function(target, batchcmds, sourcefile_proto, opt)
import("proto").buildcmd_pfile(target, batchcmds, sourcefile_proto, "cc", opt)
end)
on_buildcmd_file(function(target, batchcmds, sourcefile_proto, opt)