run-cmake.py: pass Python args as cmake args instead of env vars

Keeping it more explicit and to avoid reconfiguration issues.
This commit is contained in:
Andrej730
2026-09-11 18:47:42 +05:00
parent 3ccfda1911
commit 23f3874de1
+4 -7
View File
@@ -277,6 +277,9 @@ def main() -> None:
f"-DCMAKE_PREFIX_PATH={cmake_prefix_path}", f"-DCMAKE_PREFIX_PATH={cmake_prefix_path}",
f"-DADD_COMMIT_SHA={ADD_COMMIT_SHA}", f"-DADD_COMMIT_SHA={ADD_COMMIT_SHA}",
f"-DVERSION_OVERRIDE={VERSION_OVERRIDE}", f"-DVERSION_OVERRIDE={VERSION_OVERRIDE}",
f"-DPYTHON_EXECUTABLE={python_executable}",
f"-DPYTHON_INCLUDE_DIR={python_include_dir}",
f"-DPYTHON_LIBRARY={python_library}",
] ]
if qt_dir: if qt_dir:
cmake_args.append(f"-DQT_DIR={qt_dir}") cmake_args.append(f"-DQT_DIR={qt_dir}")
@@ -290,13 +293,7 @@ def main() -> None:
"cmake", "cmake",
*cmake_args, *cmake_args,
cwd=build_dir, cwd=build_dir,
env={ env=Deps.env_dict(),
**Deps.env_dict(),
"PYTHONHOME": str(pythonhome),
"PYTHON_EXECUTABLE": str(python_executable),
"PYTHON_INCLUDE_DIR": str(python_include_dir),
"PYTHON_LIBRARY": str(python_library),
},
) )
logger.info("") logger.info("")