Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-18 06:21:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix voxel library in nix build script

Browse Source
This commit is contained in:
Thomas Krijnen
2019-04-30 13:24:28 +02:00
parent f9e839817d
commit b862f633db
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nix/build-all.py
+3 -2
View File
@@ -321,6 +321,7 @@ def git_clone(clone_url, target_dir, revision=None):
logger.info("directory '%s' exists, skipping cloning" % (target_dir,)) logger.info("directory '%s' exists, skipping cloning" % (target_dir,))
if revision != None: if revision != None:
run([git, "checkout", revision], cwd=target_dir) run([git, "checkout", revision], cwd=target_dir)
run([git, "pull"], cwd=target_dir)
def build_dependency(name, mode, build_tool_args, download_url, download_name, download_tool=download_tool_default, revision=None, patch=None, additional_files={}, no_append_name=False): def build_dependency(name, mode, build_tool_args, download_url, download_name, download_tool=download_tool_default, revision=None, patch=None, additional_files={}, no_append_name=False):
"""Handles building of dependencies with different tools (which are """Handles building of dependencies with different tools (which are
@@ -674,7 +675,7 @@ if "voxel" in targets:
"voxel", "voxel",
"cmake", "cmake",
build_tool_args=[ build_tool_args=[
"-IFCSUPPORT=Off", "-DIFC_SUPPORT=Off",
"-DOCC_INCLUDE_DIR=" +occ_include_dir, "-DOCC_INCLUDE_DIR=" +occ_include_dir,
"-DOCC_LIBRARY_DIR=" +occ_library_dir, "-DOCC_LIBRARY_DIR=" +occ_library_dir,
"-DCMAKE_INSTALL_PREFIX={DEPS_DIR}/install/voxel".format(**locals()), "-DCMAKE_INSTALL_PREFIX={DEPS_DIR}/install/voxel".format(**locals()),
@@ -683,7 +684,7 @@ if "voxel" in targets:
download_url="https://github.com/opensourceBIM/voxel.git", download_url="https://github.com/opensourceBIM/voxel.git",
download_name="voxel", download_name="voxel",
download_tool=download_tool_git, download_tool=download_tool_git,
revision=master revision="master"
) )
cecho("Building IfcOpenShell:", GREEN) cecho("Building IfcOpenShell:", GREEN)