mirror of
https://github.com/IfcOpenShell/IfcOpenShell.git
synced 2026-09-28 03:05:33 +00:00
build-all.py - use find_package for opencollada
This commit is contained in:
+3
-9
@@ -1149,12 +1149,9 @@ elif "occ" in targets:
|
|||||||
cmake_args.extend(["-DOCC_INCLUDE_DIR=" + occ_include_dir, "-DOCC_LIBRARY_DIR=" + occ_library_dir])
|
cmake_args.extend(["-DOCC_INCLUDE_DIR=" + occ_include_dir, "-DOCC_LIBRARY_DIR=" + occ_library_dir])
|
||||||
|
|
||||||
if "OpenCOLLADA" in targets:
|
if "OpenCOLLADA" in targets:
|
||||||
cmake_args.extend(
|
# 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.
|
||||||
f"-DOPENCOLLADA_INCLUDE_DIR={DEPS_DIR}/install/OpenCOLLADA/include/opencollada",
|
cmake_args_prefix_path.append(f"{DEPS_DIR}/install/OpenCOLLADA")
|
||||||
f"-DOPENCOLLADA_LIBRARY_DIR={DEPS_DIR}/install/OpenCOLLADA/lib/opencollada",
|
|
||||||
]
|
|
||||||
)
|
|
||||||
else:
|
else:
|
||||||
cmake_args.extend(
|
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:
|
if "libxml2" in targets:
|
||||||
cmake_args_prefix_path.append(f"{DEPS_DIR}/install/libxml2-{LIBXML2_VERSION}")
|
cmake_args_prefix_path.append(f"{DEPS_DIR}/install/libxml2-{LIBXML2_VERSION}")
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user