From 8c89ba497bbd81fdc9b7c6ce4241af7da2cd1422 Mon Sep 17 00:00:00 2001 From: Andrej730 Date: Thu, 18 Sep 2025 09:34:53 +0500 Subject: [PATCH] build-all.py - use find_package for opencollada --- nix/build-all.py | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/nix/build-all.py b/nix/build-all.py index 84cb261b6f..381a33770e 100644 --- a/nix/build-all.py +++ b/nix/build-all.py @@ -1149,12 +1149,9 @@ elif "occ" in targets: cmake_args.extend(["-DOCC_INCLUDE_DIR=" + occ_include_dir, "-DOCC_LIBRARY_DIR=" + occ_library_dir]) if "OpenCOLLADA" in targets: - cmake_args.extend( - [ - f"-DOPENCOLLADA_INCLUDE_DIR={DEPS_DIR}/install/OpenCOLLADA/include/opencollada", - f"-DOPENCOLLADA_LIBRARY_DIR={DEPS_DIR}/install/OpenCOLLADA/lib/opencollada", - ] - ) + # pcre is a dependency of OpenCOLLADA, but since we `find_package`, + # we don't need to add it explicitly here as cmake will find it from the config. + cmake_args_prefix_path.append(f"{DEPS_DIR}/install/OpenCOLLADA") else: cmake_args.extend( [ @@ -1162,9 +1159,6 @@ else: ] ) -if "pcre" in targets: - cmake_args.append(f"-DPCRE_LIBRARY_DIR={DEPS_DIR}/install/pcre-{PCRE_VERSION}/lib") - if "libxml2" in targets: cmake_args_prefix_path.append(f"{DEPS_DIR}/install/libxml2-{LIBXML2_VERSION}")