@@ 108,8 108,8 @@ def build(syscfg, job):
cfg["build_externs"] = externs
cfg["cmake_variables"] = cmake.dict_to_vars(cfg["cmake"])
- log = cmake.configure_and_build(cmake_template.safe_substitute(cfg))
+ log = cmake.configure_and_build(cmake_template.safe_substitute(cfg), cfg.get("toolchain", None))
return True;
-
No newline at end of file
+
@@ 56,16 56,19 @@ def subproc(args, cwd = None):
-def configure(build_type):
- ec = subproc(["cmake", "..", "-DCMAKE_BUILD_TYPE=" + build_type], "build")
+def configure(build_type, toolchain = None):
+ cmd = ["cmake", "..", "-DCMAKE_BUILD_TYPE=" + build_type]
+ if toolchain:
+ cmd = cmd + ["-DCMAKE_TOOLCHAIN_FILE=" + toolchain]
+ ec = subproc(cmd, "build")
return ec
def build(build_type):
return subproc(["cmake", "--build", "build", "--config", build_type])
-def configure_and_build(cmakelists):
+def configure_and_build(cmakelists, toolchain = None):
open("CMakeLists.txt", "w").write(cmakelists)
- log = configure("Release")
+ log = configure("Release", toolchain)
log = log + build("Release")
return log