Allow to use additional_build_args from configs.

egorpugin · egorpugin · commit f0212beb09bd · 2018-03-27T23:01:29.000+03:00
diff --git a/src/client/main.cpp b/src/client/main.cpp
@@ -114,7 +114,8 @@ try
             if (args[i] == "--"s)
             {
                 auto &s = Settings::get_user_settings();
-                s.additional_build_args.assign(args_copy.begin() + i + 1, args_copy.end());
+                for (auto &arg : decltype(args_copy){ args_copy.begin() + i + 1, args_copy.end() })
+                    s.additional_build_args += arg + " ";
                 args_copy.erase(args_copy.begin() + i, args_copy.end());
             }
 
diff --git a/src/common/settings.cpp b/src/common/settings.cpp
@@ -191,6 +191,7 @@ void Settings::load_main(const yaml &root, const SettingsType type)
     YAML_EXTRACT_AUTO(copy_import_libs);
     YAML_EXTRACT_AUTO(rc_enabled);
     YAML_EXTRACT_AUTO(short_local_names);
+    YAML_EXTRACT_AUTO(additional_build_args);
     YAML_EXTRACT_AUTO(full_path_executables);
     YAML_EXTRACT_AUTO(var_check_jobs);
     YAML_EXTRACT_AUTO(install_prefix);
@@ -274,6 +275,7 @@ void Settings::load_build(const yaml &root)
     YAML_EXTRACT_AUTO(copy_import_libs);
     YAML_EXTRACT_AUTO(rc_enabled);
     YAML_EXTRACT_AUTO(short_local_names);
+    YAML_EXTRACT_AUTO(additional_build_args);
     YAML_EXTRACT_AUTO(full_path_executables);
     YAML_EXTRACT_AUTO(var_check_jobs);
     YAML_EXTRACT_AUTO(install_prefix);
diff --git a/src/common/settings.h b/src/common/settings.h
@@ -130,7 +130,7 @@ struct Settings
     String install_prefix;
 
     // for build command
-    Strings additional_build_args;
+    String additional_build_args;
 
     // to differentiate different cmake invocations
     String meta_target_suffix;
diff --git a/src/printers/cmake.cpp b/src/printers/cmake.cpp
@@ -1328,8 +1328,7 @@ int CMakePrinter::build(const BuildSettings &bs) const
     if (!us.additional_build_args.empty())
     {
         c.args.push_back("--");
-        for (auto &a : us.additional_build_args)
-            c.args.push_back(a);
+        c.args.push_back(us.additional_build_args);
     }
 
     return run_command(settings, c).value();

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,8 @@ try`
`114`	`114`	`if (args[i] == "--"s)`
`115`	`115`	`{`
`116`	`116`	`auto &s = Settings::get_user_settings();`
`117`		`- s.additional_build_args.assign(args_copy.begin() + i + 1, args_copy.end());`
	`117`	`+ for (auto &arg : decltype(args_copy){ args_copy.begin() + i + 1, args_copy.end() })`
	`118`	`+ s.additional_build_args += arg + " ";`
`118`	`119`	`args_copy.erase(args_copy.begin() + i, args_copy.end());`
`119`	`120`	`}`
`120`	`121`
Original file line number	Diff line number	Diff line change
`@@ -1328,8 +1328,7 @@ int CMakePrinter::build(const BuildSettings &bs) const`
`1328`	`1328`	`if (!us.additional_build_args.empty())`
`1329`	`1329`	`{`
`1330`	`1330`	`c.args.push_back("--");`
`1331`		`- for (auto &a : us.additional_build_args)`
`1332`		`- c.args.push_back(a);`
	`1331`	`+ c.args.push_back(us.additional_build_args);`
`1333`	`1332`	`}`
`1334`	`1333`
`1335`	`1334`	`return run_command(settings, c).value();`