Skip to content

Commit

Permalink
Make cmake_src_subfolder, cmake_generate_args_common ,cmake_build_arg…
Browse files Browse the repository at this point in the history
…s_common optional arguments in build_config.json (#82)

Signed-off-by: Steve Pham <[email protected]>
  • Loading branch information
spham-amzn authored Jan 27, 2022
1 parent 0fe74f4 commit ad11f19
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Scripts/extras/pull_and_build_from_git.py
Original file line number Diff line number Diff line change
Expand Up @@ -234,9 +234,9 @@ def _get_value(value_key, required=True, default=None):
self.cmake_find_template_custom_indent = _get_value("cmake_find_template_custom_indent", default=1)
self.additional_src_files = _get_value("additional_src_files", required=False)
self.depends_on_packages = _get_value("depends_on_packages", required=False)
self.cmake_src_subfolder = _get_value("cmake_src_subfolder")
self.cmake_generate_args_common = _get_value("cmake_generate_args_common")
self.cmake_build_args_common = _get_value("cmake_build_args_common")
self.cmake_src_subfolder = _get_value("cmake_src_subfolder", required=False)
self.cmake_generate_args_common = _get_value("cmake_generate_args_common", required=False)
self.cmake_build_args_common = _get_value("cmake_build_args_common", required=False)
if self.cmake_find_template and self.cmake_find_source:
raise BuildError("Bad build config file. 'cmake_find_template' and 'cmake_find_source' cannot both be set in the configuration.")
if not self.cmake_find_template and not self.cmake_find_source:
Expand Down

0 comments on commit ad11f19

Please sign in to comment.