build-all.py - include swig-version to dependency name

Otherwise it doesn't update and keeps using older cached version.
This commit is contained in:
Andrej730
2025-11-17 18:47:58 +05:00
parent 919231b096
commit d19b6d72ef
+5 -5
View File
@@ -943,7 +943,7 @@ if "pcre2" in targets:
if "swig" in targets: if "swig" in targets:
build_dependency( build_dependency(
name="swig", name=f"swig-{SWIG_VERSION}",
mode="autoconf", mode="autoconf",
build_tool_args=["--disable-ccache", f"--with-pcre2-prefix={DEPS_DIR}/install/pcre2-{PCRE2_VERSION}"], build_tool_args=["--disable-ccache", f"--with-pcre2-prefix={DEPS_DIR}/install/pcre2-{PCRE2_VERSION}"],
download_url="https://github.com/swig/swig.git", download_url="https://github.com/swig/swig.git",
@@ -1429,6 +1429,9 @@ if "rocksdb" in targets:
] ]
) )
if "swig" in targets:
cmake_args_prefix_path.append(f"{DEPS_DIR}/install/swig-{SWIG_VERSION}")
if not WASM and (not explicit_targets or {"IfcGeom", "IfcConvert", "IfcGeomServer"} & set(explicit_targets)): if not WASM and (not explicit_targets or {"IfcGeom", "IfcConvert", "IfcGeomServer"} & set(explicit_targets)):
logger.info("\rConfiguring executables...") logger.info("\rConfiguring executables...")
@@ -1481,9 +1484,6 @@ if "IfcOpenShell-Python" in targets:
if os.path.exists(cache_path): if os.path.exists(cache_path):
os.remove(cache_path) os.remove(cache_path)
prefix_paths: list[str] = []
if "swig" in targets:
prefix_paths.append(f"{DEPS_DIR}/install/swig")
if python_path: if python_path:
# We couldn't just prefix PATH and have to provide all variables explicitly, # We couldn't just prefix PATH and have to provide all variables explicitly,
# see ifcwrap/cmake for the details. # see ifcwrap/cmake for the details.
@@ -1500,7 +1500,7 @@ if "IfcOpenShell-Python" in targets:
run_cmake( run_cmake(
"", "",
cmake_args cmake_args
+ get_cmake_args_prefix_path(prefix_paths) + get_cmake_args_prefix_path()
+ [ + [
*([f"-DPYTHON_EXECUTABLE={python_executable}"] if python_executable else []), *([f"-DPYTHON_EXECUTABLE={python_executable}"] if python_executable else []),
# Needed because pyodide is expecting setup.py to be in the root. # Needed because pyodide is expecting setup.py to be in the root.