Skip to content

fix: compile_commands.json generation #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
targos merged 2 commits into from
Apr 3, 2020
Merged

fix: compile_commands.json generation #22

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e2ecd8
fix: compile_commands.json generation
lundibundi Mar 30, 2020
9819daa
Merge branch 'master' into fix-compile-commands-gen
targos Apr 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pylib/gyp/generator/compile_commands_json.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ def CalculateVariables(default_variables, params):


def AddCommandsForTarget(cwd, target, params, per_config_commands):
output_dir = params["generator_flags"]["output_dir"]
output_dir = params["generator_flags"].get("output_dir", "out")
for configuration_name, configuration in target["configurations"].items():
builddir_name = os.path.join(output_dir, configuration_name)

Expand Down Expand Up @@ -110,7 +110,7 @@ def GenerateOutput(target_list, target_dicts, data, params):
cwd = os.path.dirname(build_file)
AddCommandsForTarget(cwd, target, params, per_config_commands)

output_dir = params["generator_flags"]["output_dir"]
output_dir = params["generator_flags"].get("output_dir", "out")
for configuration_name, commands in per_config_commands.items():
filename = os.path.join(output_dir, configuration_name, "compile_commands.json")
gyp.common.EnsureDirExists(filename)
Expand Down