Skip to content

Commit

Permalink
Add single val to dict directly rather than using update() (#69)
Browse files Browse the repository at this point in the history
  • Loading branch information
ThibFrgsGmz authored May 23, 2022
1 parent b741779 commit fda3302
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 7 deletions.
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

0 comments on commit fda3302

Please sign in to comment.