Skip to content
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.

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

Add a single value to the dictionary directly rather than using update() #69

Merged
merged 1 commit into from
May 23, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 3 additions & 5 deletions src/fprime/fbuild/builder.py
Original file line number Diff line number Diff line change
Expand Up @@ -323,12 +323,10 @@ def get_cmake_args(self) -> dict:
v3_autocoder_directory.exists()
and self.build_type == BuildType.BUILD_TESTING
):
cmake_args.update({"BUILD_TESTING": "ON"})
cmake_args.update(
{"CMAKE_BUILD_TYPE": cmake_args.get("CMAKE_BUILD_TYPE", "Debug")}
)
cmake_args["BUILD_TESTING"] = "ON"
cmake_args["CMAKE_BUILD_TYPE"] = cmake_args.get("CMAKE_BUILD_TYPE", "Debug")
elif self.build_type == BuildType.BUILD_TESTING:
cmake_args.update({"CMAKE_BUILD_TYPE": "Testing"})
cmake_args["CMAKE_BUILD_TYPE"] = "Testing"
return cmake_args

def get_module_name(self, path: Path):
Expand Down
2 changes: 1 addition & 1 deletion src/fprime/fbuild/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def run_fbuild_cli(
print(f"[INFO] Generating build directory at: {build.build_dir}")
print(f"[INFO] Using toolchain file {toolchain} for platform {parsed.platform}")
if toolchain is not None:
cmake_args.update({"CMAKE_TOOLCHAIN_FILE": toolchain})
cmake_args["CMAKE_TOOLCHAIN_FILE"] = toolchain
build.generate(cmake_args)
elif parsed.command == "purge":
# Since purge does not load its "base", we need to overload the platform
Expand Down
2 changes: 1 addition & 1 deletion src/fprime/util/build_helper.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ def validate(parsed, unknown):
# Build type only for generate, jobs only for non-generate
elif parsed.command in Target.get_all_targets():
parsed.settings = None # Force to load from cache if possible
make_args.update({"--jobs": (1 if parsed.jobs <= 0 else parsed.jobs)})
make_args["--jobs"] = 1 if parsed.jobs <= 0 else parsed.jobs
# Check if any arguments are still unknown
if unknown:
runnable = f"{os.path.basename(sys.argv[0])} {parsed.command}"
Expand Down