From ad11f1924dfcc4240f18ac498a90d85121fd294b Mon Sep 17 00:00:00 2001 From: Steve Pham <82231385+spham-amzn@users.noreply.github.com> Date: Wed, 26 Jan 2022 17:33:31 -0800 Subject: [PATCH] Make cmake_src_subfolder, cmake_generate_args_common ,cmake_build_args_common optional arguments in build_config.json (#82) Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com> --- Scripts/extras/pull_and_build_from_git.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Scripts/extras/pull_and_build_from_git.py b/Scripts/extras/pull_and_build_from_git.py index 3e02f109..576ef22e 100644 --- a/Scripts/extras/pull_and_build_from_git.py +++ b/Scripts/extras/pull_and_build_from_git.py @@ -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: