diff options
| author | ruki <[email protected]> | 2025-12-10 23:22:20 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2025-12-10 23:22:20 +0800 |
| commit | 245d472158edc782c4ee7ddb6d47be65270c5451 (patch) | |
| tree | 4ca07a5aebef1b1d018464324bd0927e0eb99b7b /xmake/plugins | |
| parent | 4bf9a07b5c5b375f16199e61bacee266025b5957 (diff) | |
| parent | d7787802f3ea77850958818e3bd827cd14b4d7dd (diff) | |
Merge pull request #7104 from Shiffted/fix_module_projects
Fix prepare for project generators
Diffstat (limited to 'xmake/plugins')
| -rw-r--r-- | xmake/plugins/project/clang/compile_commands.lua | 1 | ||||
| -rw-r--r-- | xmake/plugins/project/clang/compile_flags.lua | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/xmake/plugins/project/clang/compile_commands.lua b/xmake/plugins/project/clang/compile_commands.lua index 9435819df..a017b4a32 100644 --- a/xmake/plugins/project/clang/compile_commands.lua +++ b/xmake/plugins/project/clang/compile_commands.lua @@ -308,6 +308,7 @@ function make(outputdir) local oldir = os.cd(os.projectdir()) local jsonfile = io.open(path.join(outputdir, "compile_commands.json"), "w") os.setenv("XMAKE_IN_COMPILE_COMMANDS_PROJECT_GENERATOR", "true") + target_cmds.prepare_targets() _add_targets(jsonfile) jsonfile:close() os.setenv("XMAKE_IN_COMPILE_COMMANDS_PROJECT_GENERATOR", nil) diff --git a/xmake/plugins/project/clang/compile_flags.lua b/xmake/plugins/project/clang/compile_flags.lua index e4b07ec34..07f9de38c 100644 --- a/xmake/plugins/project/clang/compile_flags.lua +++ b/xmake/plugins/project/clang/compile_flags.lua @@ -23,6 +23,7 @@ import("core.tool.compiler") import("core.project.project") import("core.language.language") import("private.utils.target", {alias = "target_utils"}) +import("plugins.project.utils.target_cmds", {rootdir = os.programdir()}) -- make the object function _make_object(target, flags, sourcefile, objectfile) |
