浏览代码

Make cmake_src_subfolder, cmake_generate_args_common ,cmake_build_args_common optional arguments in build_config.json (#82)

Signed-off-by: Steve Pham <[email protected]>
Steve Pham 3 年之前
父节点
当前提交
ad11f1924d
共有 1 个文件被更改,包括 3 次插入3 次删除
  1. 3 3
      Scripts/extras/pull_and_build_from_git.py

+ 3 - 3
Scripts/extras/pull_and_build_from_git.py

@@ -234,9 +234,9 @@ class PackageInfo(object):
         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: